Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a52c131a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert "Revert "Only update default home when the preferred home... 

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

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

Change-Id: I90f40eb4c45f06ae77eac488a34990bc2986e550
parents 0d32edba a2547e30

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

+9 −2
Original line number Diff line number Diff line
@@ -22006,7 +22006,7 @@ public class PackageManagerService extends IPackageManager.Stub 
            pir.addFilter(new PreferredActivity(filter, match, set, activity, always));

            scheduleWritePackageRestrictionsLocked(userId);

        }

        if (!updateDefaultHomeNotLocked(userId)) {

        if (!(isHomeFilter(filter) && updateDefaultHomeNotLocked(userId))) {

            postPreferredActivityChangedBroadcast(userId);

        }

    }
@@ -22296,7 +22296,9 @@ public class PackageManagerService extends IPackageManager.Stub 
                    new PersistentPreferredActivity(filter, activity, true));

            scheduleWritePackageRestrictionsLocked(userId);

        }

        if (isHomeFilter(filter)) {

            updateDefaultHomeNotLocked(userId);

        }

        postPreferredActivityChangedBroadcast(userId);

    }










@@ -22665,6 +22667,11 @@ public class PackageManagerService extends IPackageManager.Stub













        return filter;















    }



























    private boolean isHomeFilter(@NonNull WatchedIntentFilter 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,