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

Revert "Only update default home when the preferred home activity is modified."

Browse Source 
This reverts commit cac5c6812a.

Reason for revert: Broke build
Bug: 178191941

Change-Id: Idd8d4e3421fe2f9df1165974359fc2f4294a9725
This commit is contained in:
Hai Zhang
2021-05-08 09:09:41 +00:00
committed by Guang Zhu
parent cac5c6812a
commit d30570e29a
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

@@ -22015,7 +22015,7 @@ public class PackageManagerService extends IPackageManager.Stub
pir.addFilter(new PreferredActivity(filter, match, set, activity, always));
scheduleWritePackageRestrictionsLocked(userId);
}
if (!(isHomeFilter(filter) && updateDefaultHomeNotLocked(userId))) {
if (!updateDefaultHomeNotLocked(userId)) {
postPreferredActivityChangedBroadcast(userId);
}
}
@@ -22272,9 +22272,7 @@ public class PackageManagerService extends IPackageManager.Stub
new PersistentPreferredActivity(filter, activity, true));
scheduleWritePackageRestrictionsLocked(userId);
}
if (isHomeFilter(filter)) {
updateDefaultHomeNotLocked(userId);
}
updateDefaultHomeNotLocked(userId);
postPreferredActivityChangedBroadcast(userId);
}
@@ -22611,11 +22609,6 @@ public class PackageManagerService extends IPackageManager.Stub
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,
int userId) {
return liveComputer().getHomeActivitiesAsUser(allHomeCandidates,