summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/PackageInstaller/src/com/android/packageinstaller/v2/model/UninstallRepository.java7
-rw-r--r--packages/PackageInstaller/src/com/android/packageinstaller/v2/ui/UninstallLaunch.java1
-rw-r--r--packages/PackageInstaller/src/com/android/packageinstaller/v2/viewmodel/UninstallViewModel.java4
3 files changed, 12 insertions, 0 deletions
diff --git a/packages/PackageInstaller/src/com/android/packageinstaller/v2/model/UninstallRepository.java b/packages/PackageInstaller/src/com/android/packageinstaller/v2/model/UninstallRepository.java
index 628d11194f2f..2e43b75e5123 100644
--- a/packages/PackageInstaller/src/com/android/packageinstaller/v2/model/UninstallRepository.java
+++ b/packages/PackageInstaller/src/com/android/packageinstaller/v2/model/UninstallRepository.java
@@ -682,6 +682,13 @@ public class UninstallRepository {
}
}
+ public void cancelInstall() {
+ if (mCallback != null) {
+ mCallback.onUninstallComplete(mTargetPackageName,
+ PackageManager.DELETE_FAILED_ABORTED, "Cancelled by user");
+ }
+ }
+
public MutableLiveData<UninstallStage> getUninstallResult() {
return mUninstallResult;
}
diff --git a/packages/PackageInstaller/src/com/android/packageinstaller/v2/ui/UninstallLaunch.java b/packages/PackageInstaller/src/com/android/packageinstaller/v2/ui/UninstallLaunch.java
index 0886d7767829..7638e917c7d5 100644
--- a/packages/PackageInstaller/src/com/android/packageinstaller/v2/ui/UninstallLaunch.java
+++ b/packages/PackageInstaller/src/com/android/packageinstaller/v2/ui/UninstallLaunch.java
@@ -161,6 +161,7 @@ public class UninstallLaunch extends FragmentActivity implements UninstallAction
@Override
public void onNegativeResponse() {
+ mUninstallViewModel.cancelInstall();
setResult(Activity.RESULT_FIRST_USER, null, true);
}
}
diff --git a/packages/PackageInstaller/src/com/android/packageinstaller/v2/viewmodel/UninstallViewModel.java b/packages/PackageInstaller/src/com/android/packageinstaller/v2/viewmodel/UninstallViewModel.java
index 690f7793b4fb..3f7bce8f85d0 100644
--- a/packages/PackageInstaller/src/com/android/packageinstaller/v2/viewmodel/UninstallViewModel.java
+++ b/packages/PackageInstaller/src/com/android/packageinstaller/v2/viewmodel/UninstallViewModel.java
@@ -62,4 +62,8 @@ public class UninstallViewModel extends AndroidViewModel {
}
});
}
+
+ public void cancelInstall() {
+ mRepository.cancelInstall();
+ }
}