commit a2547e3057d40485652cef2e73a560ca22691bf8
author TreeHugger Robot <treehugger-gerrit@google.com> Mon May 10 16:48:58 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon May 10 16:48:58 2021 +0000
tree a89c767b70c943a0645cf466aa764dd20cc477b7
parent f572f77a6f4f71048c7452650d76f48f05d84941
parent 9c9b661253be41e0dd736c350aa3bb15c3606bed

Merge "Revert "Revert "Only update default home when the preferred home activity is modified.""" into sc-dev

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 219fa3c..a688868 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -22005,7 +22005,7 @@
             pir.addFilter(new PreferredActivity(filter, match, set, activity, always));
             scheduleWritePackageRestrictionsLocked(userId);
         }
-        if (!updateDefaultHomeNotLocked(userId)) {
+        if (!(isHomeFilter(filter) && updateDefaultHomeNotLocked(userId))) {
             postPreferredActivityChangedBroadcast(userId);
         }
     }
@@ -22295,7 +22295,9 @@
                     new PersistentPreferredActivity(filter, activity, true));
             scheduleWritePackageRestrictionsLocked(userId);
         }
-        updateDefaultHomeNotLocked(userId);
+        if (isHomeFilter(filter)) {
+            updateDefaultHomeNotLocked(userId);
+        }
         postPreferredActivityChangedBroadcast(userId);
     }
 
@@ -22664,6 +22666,11 @@
         return filter;
     }
 
+    private boolean isHomeFilter(@NonNull WatchedIntentFilter 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,