commit a3adecc44c28343bef5491d1a0abfed4ff461a04
author Jeongsik Mun <jeongsik.mun@samsung.corp-partner.google.com> Wed Sep 07 18:14:51 2022 +0900
committer Winson Chiu <chiuwinson@google.com> Thu Sep 22 17:03:39 2022 +0000
tree 5a3428048a69d5d16abdbf58385de87e61dcac21
parent 3772ca495261ef859eb241c9900995d7c9002e92

Fix a lot of OVERLAY_CHANGED broadcasts

A regression was introduced during refactoring where replacing with
PackageStateMutation. This caused a lot of OVERLAY_CHANGED sent while
switching to Owner user from Secondary user.

This CL modifies the logic to check if OverlayPaths can be updated
like Android S.

Bug: 245485968
Test: manually verified that OVERLAY_CHANGED not sent as expected.
Change-Id: I247aa6d2abce28eebe60e622dbffad12d1c9540c

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

diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index 39a6eb7..b2f3d58 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -6539,7 +6539,7 @@
                             if (dependentState == null) {
                                 continue;
                             }
-                            if (!Objects.equals(dependentState.getUserStateOrDefault(userId)
+                            if (canSetOverlayPaths(dependentState.getUserStateOrDefault(userId)
                                     .getSharedLibraryOverlayPaths()
                                     .get(libName), newOverlayPaths)) {
                                 String dependentPackageName = dependent.getPackageName();
@@ -6563,7 +6563,10 @@
                     }
                 }
 
-                outUpdatedPackageNames.add(targetPackageName);
+                if (canSetOverlayPaths(packageState.getUserStateOrDefault(userId).getOverlayPaths(),
+                        newOverlayPaths)) {
+                    outUpdatedPackageNames.add(targetPackageName);
+                }
             }
 
             commitPackageStateMutation(null, mutator -> {
@@ -6614,6 +6617,17 @@
         invalidatePackageInfoCache();
     }
 
+    private boolean canSetOverlayPaths(OverlayPaths origPaths, OverlayPaths newPaths) {
+        if (Objects.equals(origPaths, newPaths)) {
+            return false;
+        }
+        if ((origPaths == null && newPaths.isEmpty())
+                || (newPaths == null && origPaths.isEmpty())) {
+            return false;
+        }
+        return true;
+    }
+
     private void maybeUpdateSystemOverlays(String targetPackageName, OverlayPaths newOverlayPaths) {
         if (!mResolverReplaced) {
             if (targetPackageName.equals("android")) {