commit 7e7c76c8a8e3a3436d823a2b90f0298f6eab3c8c
author Baligh Uddin <baligh@google.com> Sat May 08 16:30:38 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat May 08 16:30:38 2021 +0000
tree d72c9830e1bc7f3e90008e6d5c30719cb3210f9d
parent 83a305a0890e2f4de91775c98f6500330f90d23a
parent d30570e29aba21d223ae436f3e0720d91ba1920f

Merge "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 da9c785..219fa3c 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 (!(isHomeFilter(filter) && updateDefaultHomeNotLocked(userId))) {
+        if (!updateDefaultHomeNotLocked(userId)) {
             postPreferredActivityChangedBroadcast(userId);
         }
     }
@@ -22295,9 +22295,7 @@
                     new PersistentPreferredActivity(filter, activity, true));
             scheduleWritePackageRestrictionsLocked(userId);
         }
-        if (isHomeFilter(filter)) {
-            updateDefaultHomeNotLocked(userId);
-        }
+        updateDefaultHomeNotLocked(userId);
         postPreferredActivityChangedBroadcast(userId);
     }
 
@@ -22666,11 +22664,6 @@
         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,