commit 3e0e8128d5667be6d739dda8730d5a6f5483b3ef
author John Wu <topjohnwu@google.com> Thu Jul 14 21:55:23 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Jul 29 22:35:28 2022 +0000
tree 94a1573733a68c7b8e6bf0bbbe35fcabaa38d153
parent f3097ad6d536a0f96b0246711de5353cc660c57c

Ignore sharedUserId when package already left shared UID

After a package has left shared UID, its non-shared UID state should be
preserved after the next scan (e.g. reboot or an APK upgrade), or else
the app would observe data loss.

Bug: 235460457
Test: atest CtsSharedUserMigrationTestCases
Change-Id: I692fe3ff59b43f2fc0ee53de0ce8a2f38cd29f02
(cherry picked from commit 84ba40de12dac4efa6b90197e910dcdf432009f5)
Merged-In: I692fe3ff59b43f2fc0ee53de0ce8a2f38cd29f02

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

diff --git a/services/core/java/com/android/server/pm/InstallPackageHelper.java b/services/core/java/com/android/server/pm/InstallPackageHelper.java
index e90a5db..7da5f51 100644
--- a/services/core/java/com/android/server/pm/InstallPackageHelper.java
+++ b/services/core/java/com/android/server/pm/InstallPackageHelper.java
@@ -3701,8 +3701,9 @@
                     parsedPackage.getPackageName());
 
             boolean ignoreSharedUserId = false;
-            if (installedPkgSetting == null) {
-                // We can directly ignore sharedUserSetting for new installs
+            if (installedPkgSetting == null || !installedPkgSetting.hasSharedUser()) {
+                // Directly ignore sharedUserSetting for new installs, or if the app has
+                // already left shared UID
                 ignoreSharedUserId = parsedPackage.isLeavingSharedUid();
             }