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

Merge "Revert "Only update default home when the preferred home activity is modified."" into sc-dev

Browse Source
This commit is contained in:
Baligh Uddin
2021-05-08 16:30:38 +00:00
committed by Android (Google) Code Review
parent 83a305a089 d30570e29a
commit 7e7c76c8a8
1 changed files with 2 additions and 9 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 (!(isHomeFilter(filter) && updateDefaultHomeNotLocked(userId))) { if (!updateDefaultHomeNotLocked(userId)) {
postPreferredActivityChangedBroadcast(userId); postPreferredActivityChangedBroadcast(userId);
} }
} }
@@ -22295,9 +22295,7 @@ public class PackageManagerService extends IPackageManager.Stub
new PersistentPreferredActivity(filter, activity, true)); new PersistentPreferredActivity(filter, activity, true));
scheduleWritePackageRestrictionsLocked(userId); scheduleWritePackageRestrictionsLocked(userId);
} }
if (isHomeFilter(filter)) { updateDefaultHomeNotLocked(userId);
updateDefaultHomeNotLocked(userId);
}
postPreferredActivityChangedBroadcast(userId); postPreferredActivityChangedBroadcast(userId);
} }
@@ -22666,11 +22664,6 @@ 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,