From f79bba7002a61546a0c0747476f91bc062eb92c4 Mon Sep 17 00:00:00 2001
From: Sumedh Sen <sumedhsen@google.com>
Date: Tue, 31 Oct 2023 18:36:33 -0700
Subject: [PATCH] On negative user action, cancel the install

Send an aborted message to the caller and set appropriate activity result code.

Bug: 182205982
Test: builds successfully
Test: No CTS Tests. Flag to use new app is turned off by default

Change-Id: Ib92caadd2ffb7d13b282c355db45b06f67796a77
---
 .../packageinstaller/v2/model/UninstallRepository.java     | 7 +++++++
 .../android/packageinstaller/v2/ui/UninstallLaunch.java    | 1 +
 .../packageinstaller/v2/viewmodel/UninstallViewModel.java  | 4 ++++
 3 files changed, 12 insertions(+)

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();
+    }
 }
-- 
GitLab