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

Merge "Only update default home when the preferred home activity is modified." into sc-dev am: bfdcaaf25d am: 17d78b32b5

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14314665

Change-Id: I21cfc392c67ca963c4f393af881980971016f71d
This commit is contained in:
TreeHugger Robot
2021-05-08 07:55:52 +00:00
committed by Automerger Merge Worker
parent aacde8956b 17d78b32b5
commit 46b470971e
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22005,7 +22005,7 @@ public class PackageManagerService extends IPackageManager.Stub
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)) { if (!(isHomeFilter(filter) && updateDefaultHomeNotLocked(userId))) {
postPreferredActivityChangedBroadcast(userId); postPreferredActivityChangedBroadcast(userId);
} }
} }
@@ -22295,7 +22295,9 @@ public class PackageManagerService extends IPackageManager.Stub
new PersistentPreferredActivity(filter, activity, true)); new PersistentPreferredActivity(filter, activity, true));
scheduleWritePackageRestrictionsLocked(userId); scheduleWritePackageRestrictionsLocked(userId);
} }
updateDefaultHomeNotLocked(userId); if (isHomeFilter(filter)) {
updateDefaultHomeNotLocked(userId);
}
postPreferredActivityChangedBroadcast(userId); postPreferredActivityChangedBroadcast(userId);
} }
@@ -22664,6 +22666,11 @@ public class PackageManagerService extends IPackageManager.Stub
return filter; 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, ComponentName getHomeActivitiesAsUser(List<ResolveInfo> allHomeCandidates,
int userId) { int userId) {
return liveComputer().getHomeActivitiesAsUser(allHomeCandidates, return liveComputer().getHomeActivitiesAsUser(allHomeCandidates,