[PM] Only send Intent#ACTION_UID_REMOVED when removing data

If DELETE_KEEP_DATA is true, don't send Intent#ACTION_UID_REMOVED.

Bug: 336452601
Test: Manual, no Intent#ACTION_UID_REMOVED broadcast
Change-Id: I8719ab27ac476223a11454ae31590b5959b86fef

1 files changed, 5 insertions, 1 deletions

diff --git a/services/core/java/com/android/server/pm/DeletePackageHelper.java b/services/core/java/com/android/server/pm/DeletePackageHelper.java
index b2c6c49a8e41..47ee1d08780f 100644
--- a/services/core/java/com/android/server/pm/DeletePackageHelper.java
+++ b/services/core/java/com/android/server/pm/DeletePackageHelper.java
@@ -513,7 +513,11 @@ final class DeletePackageHelper {
                 // Legacy behavior to report appId as UID here.
                 // The final broadcasts will contain a per-user UID.
                 outInfo.mUid = ps.getAppId();
-                outInfo.mIsAppIdRemoved = true;
+                // Only send Intent.ACTION_UID_REMOVED when flag & DELETE_KEEP_DATA is 0
+                // i.e. the mDataRemoved is true
+                if (outInfo.mDataRemoved) {
+                    outInfo.mIsAppIdRemoved = true;
+                }
                 mPm.scheduleWritePackageRestrictions(user);
                 return;
             }