commit ae3d46ba568a1dcf8feaf089e1fcaf4a0fbc8958
author Song Chun Fan <schfan@google.com> Fri Dec 22 00:21:22 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Dec 22 00:21:22 2023 +0000
tree 8e9f07610fbeb5864e1c3209147bf0a371436e41
parent e9a8a530ae8e98abeae1097ad7d3cdacad9e3ef6
parent 0fd25c7f1797f41d5eac343ba8ee7b193ca2e8f8

Merge "Remove the clone app only when the parent app is removed" into main

services/core/java/com/android/server/pm/DeletePackageHelper.java

diff --git a/services/core/java/com/android/server/pm/DeletePackageHelper.java b/services/core/java/com/android/server/pm/DeletePackageHelper.java
index b96b704..c920ca8 100644
--- a/services/core/java/com/android/server/pm/DeletePackageHelper.java
+++ b/services/core/java/com/android/server/pm/DeletePackageHelper.java
@@ -829,6 +829,9 @@
                         int returnCodeOfChild;
                         for (int childId : childUserIds) {
                             if (childId == userId) continue;
+                            if (mUserManagerInternal.getProfileParentId(childId) != userId) {
+                                continue;
+                            }
 
                             // If package is not present in child then don't attempt to delete.
                             if (!packageState.getUserStateOrDefault(childId).isInstalled()) {