commit cac5c6812a7598caad0535172a0bbc2b676e0339
author Hai Zhang <zhanghai@google.com> Mon Apr 26 14:07:05 2021 -0700
committer Hai Zhang <zhanghai@google.com> Mon Apr 26 14:07:05 2021 -0700
tree 166803921f45537fc54c1ef49af21cd81cd3c90b
parent fac4949f01d45ea8448992e44b6f60d1d283e050

Only update default home when the preferred home activity is modified.

To avoid the race condition when other preferred activities are being
configured while home role is being set.

Fixes: 178191941
Test: presubmit
Change-Id: Ie9b4c46b6d75078dd29fffe436306b10034005d2

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 d2cbcf0..0ec7c37 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -22015,7 +22015,7 @@
             pir.addFilter(new PreferredActivity(filter, match, set, activity, always));
             scheduleWritePackageRestrictionsLocked(userId);
         }
-        if (!updateDefaultHomeNotLocked(userId)) {
+        if (!(isHomeFilter(filter) && updateDefaultHomeNotLocked(userId))) {
             postPreferredActivityChangedBroadcast(userId);
         }
     }
@@ -22272,7 +22272,9 @@
                     new PersistentPreferredActivity(filter, activity, true));
             scheduleWritePackageRestrictionsLocked(userId);
         }
-        updateDefaultHomeNotLocked(userId);
+        if (isHomeFilter(filter)) {
+            updateDefaultHomeNotLocked(userId);
+        }
         postPreferredActivityChangedBroadcast(userId);
     }
 
@@ -22609,6 +22611,11 @@
         return filter;
     }
 
+    private boolean isHomeFilter(@NonNull IntentFilter filter) {
+        return filter.hasAction(Intent.ACTION_MAIN) && filter.hasCategory(Intent.CATEGORY_HOME)
+                && filter.hasCategory(CATEGORY_DEFAULT);
+    }
+
     ComponentName getHomeActivitiesAsUser(List<ResolveInfo> allHomeCandidates,
             int userId) {
         return liveComputer().getHomeActivitiesAsUser(allHomeCandidates,