Merge "Update default home after preferred activity is changed." into qt-dev (4d5b76d3) · Commits · e / os / android_frameworks_base

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

+5 −5

Original line number	Diff line number	Diff line
		@@ -20096,14 +20096,14 @@ public class PackageManagerService extends IPackageManager.Stub
		+ userId + ":");
		filter.dump(new LogPrinter(Log.INFO, TAG), " ");
		}
		if (!updateDefaultHomeNotLocked(userId)) {
		postPreferredActivityChangedBroadcast(userId);
		}
		synchronized (mPackages) {
		final PreferredIntentResolver pir = mSettings.editPreferredActivitiesLPw(userId);
		pir.addFilter(new PreferredActivity(filter, match, set, activity, always));
		scheduleWritePackageRestrictionsLocked(userId);
		}
		if (!updateDefaultHomeNotLocked(userId)) {
		postPreferredActivityChangedBroadcast(userId);
		}
		}

		private void postPreferredActivityChangedBroadcast(int userId) {
		@@ -20418,13 +20418,13 @@ public class PackageManagerService extends IPackageManager.Stub
		+ " for user " + userId + ":");
		filter.dump(new LogPrinter(Log.INFO, TAG), " ");
		}
		updateDefaultHomeNotLocked(userId);
		postPreferredActivityChangedBroadcast(userId);
		synchronized (mPackages) {
		mSettings.editPersistentPreferredActivitiesLPw(userId).addFilter(
		new PersistentPreferredActivity(filter, activity));
		scheduleWritePackageRestrictionsLocked(userId);
		}
		updateDefaultHomeNotLocked(userId);
		postPreferredActivityChangedBroadcast(userId);
		}

		@Override