Merge "Revert "Revert "Only update default home when the preferred home... (a2547e30) · Commits · e / os / android_frameworks_base

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

+9 −2

Original line number	Diff line number	Diff line
		@@ -22005,7 +22005,7 @@ public class PackageManagerService extends IPackageManager.Stub
		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 @@ public class PackageManagerService extends IPackageManager.Stub
		new PersistentPreferredActivity(filter, activity, true));
		scheduleWritePackageRestrictionsLocked(userId);
		}
		if (isHomeFilter(filter)) {
		updateDefaultHomeNotLocked(userId);
		}
		postPreferredActivityChangedBroadcast(userId);
		}

		@@ -22664,6 +22666,11 @@ public class PackageManagerService extends IPackageManager.Stub
		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,