commit c6985445ad7cc3c355102f5023d574e1346f0bcf
author Patrick Baumann <patb@google.com> Wed Jun 17 16:13:41 2020 -0700
committer android-build-team Robot <android-build-team-robot@google.com> Thu Jun 18 19:29:21 2020 +0000
tree fc1c51fe6061b09988de940d6f07b4c6dd0696e7
parent 695428cf1cbc6319f08d17e2c428e5d8f868130f

Repopulate cache with sibling visibility on remove

This change ensures that we re-add the visibility state of a shared user
id when one of its members is removed. Prior to this change, we were
removing the app ID (and thus all other members of the shared uid) but
only recomputing on the removed setting, which we ignore in the update
(essentially an expensive no-op). This change ensures that we run
through the shared settings and re-compute with them instead.

Fixes: 159197157
Test: atest AppEnumerationTests SharedUidPermissionsTest
Change-Id: I85250e4264888ac8583a2b4798ff6a2f93d6a74d
(cherry picked from commit 5c5ac45ea00d469954752c276fa32e7fd0cc1b63)

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

diff --git a/services/core/java/com/android/server/pm/AppsFilter.java b/services/core/java/com/android/server/pm/AppsFilter.java
index ccda587..83a1ddc 100644
--- a/services/core/java/com/android/server/pm/AppsFilter.java
+++ b/services/core/java/com/android/server/pm/AppsFilter.java
@@ -819,9 +819,15 @@
             mOverlayReferenceMapper.removePkg(setting.name);
             mFeatureConfig.updatePackageState(setting, true /*removed*/);
 
-            if (mShouldFilterCache != null) {
-                updateShouldFilterCacheForPackage(
-                        setting.name, setting, settings, users, settings.size());
+            if (mShouldFilterCache != null && setting.sharedUser != null) {
+                for (int i = setting.sharedUser.packages.size() - 1; i >= 0; i--) {
+                    PackageSetting siblingSetting = setting.sharedUser.packages.valueAt(i);
+                    if (siblingSetting == setting) {
+                        continue;
+                    }
+                    updateShouldFilterCacheForPackage(
+                            setting.name, siblingSetting, settings, users, settings.size());
+                }
             }
         });
         mForceQueryable.remove(setting.appId);