Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update default home after preferred activity is changed." into qt-dev

Browse Source 
am: 4d5b76d33b

Change-Id: Iaa165616b8907df1a5aafc21fd3cfae0f9e739ae
This commit is contained in:
Hai Zhang
2019-05-12 21:10:31 -07:00
committed by android-build-merger
parent edf745d255 4d5b76d33b
commit 2117f0e8d0
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -20096,14 +20096,14 @@ public class PackageManagerService extends IPackageManager.Stub
+ userId + ":"); + userId + ":");
filter.dump(new LogPrinter(Log.INFO, TAG), " "); filter.dump(new LogPrinter(Log.INFO, TAG), " ");
} }
if (!updateDefaultHomeNotLocked(userId)) {
postPreferredActivityChangedBroadcast(userId);
}
synchronized (mPackages) { synchronized (mPackages) {
final PreferredIntentResolver pir = mSettings.editPreferredActivitiesLPw(userId); final PreferredIntentResolver pir = mSettings.editPreferredActivitiesLPw(userId);
pir.addFilter(new PreferredActivity(filter, match, set, activity, always)); pir.addFilter(new PreferredActivity(filter, match, set, activity, always));
scheduleWritePackageRestrictionsLocked(userId); scheduleWritePackageRestrictionsLocked(userId);
} }
if (!updateDefaultHomeNotLocked(userId)) {
postPreferredActivityChangedBroadcast(userId);
}
} }
private void postPreferredActivityChangedBroadcast(int userId) { private void postPreferredActivityChangedBroadcast(int userId) {
@@ -20418,13 +20418,13 @@ public class PackageManagerService extends IPackageManager.Stub
+ " for user " + userId + ":"); + " for user " + userId + ":");
filter.dump(new LogPrinter(Log.INFO, TAG), " "); filter.dump(new LogPrinter(Log.INFO, TAG), " ");
} }
updateDefaultHomeNotLocked(userId);
postPreferredActivityChangedBroadcast(userId);
synchronized (mPackages) { synchronized (mPackages) {
mSettings.editPersistentPreferredActivitiesLPw(userId).addFilter( mSettings.editPersistentPreferredActivitiesLPw(userId).addFilter(
new PersistentPreferredActivity(filter, activity)); new PersistentPreferredActivity(filter, activity));
scheduleWritePackageRestrictionsLocked(userId); scheduleWritePackageRestrictionsLocked(userId);
} }
updateDefaultHomeNotLocked(userId);
postPreferredActivityChangedBroadcast(userId);
} }
@Override @Override