From d30570e29aba21d223ae436f3e0720d91ba1920f Mon Sep 17 00:00:00 2001 From: Hai Zhang Date: Sat, 8 May 2021 09:09:41 +0000 Subject: [PATCH] Revert "Only update default home when the preferred home activity is modified." This reverts commit cac5c6812a7598caad0535172a0bbc2b676e0339. Reason for revert: Broke build Bug: 178191941 Change-Id: Idd8d4e3421fe2f9df1165974359fc2f4294a9725 --- .../com/android/server/pm/PackageManagerService.java | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 0ec7c370ce289..d2cbcf0598fcb 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 @@ public class PackageManagerService extends IPackageManager.Stub pir.addFilter(new PreferredActivity(filter, match, set, activity, always)); scheduleWritePackageRestrictionsLocked(userId); } - if (!(isHomeFilter(filter) && updateDefaultHomeNotLocked(userId))) { + if (!updateDefaultHomeNotLocked(userId)) { postPreferredActivityChangedBroadcast(userId); } } @@ -22272,9 +22272,7 @@ public class PackageManagerService extends IPackageManager.Stub new PersistentPreferredActivity(filter, activity, true)); scheduleWritePackageRestrictionsLocked(userId); } - if (isHomeFilter(filter)) { - updateDefaultHomeNotLocked(userId); - } + updateDefaultHomeNotLocked(userId); postPreferredActivityChangedBroadcast(userId); } @@ -22611,11 +22609,6 @@ public class PackageManagerService extends IPackageManager.Stub 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 allHomeCandidates, int userId) { return liveComputer().getHomeActivitiesAsUser(allHomeCandidates,