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

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

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

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

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

Change-Id: I7e45d1d0ea6291d48013a23ebd5b8c5b3004fcc9
parents 99fa5aaf bfdcaaf2

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

+9 −2
Original line number Diff line number Diff line
@@ -22005,7 +22005,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);

        }

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

            scheduleWritePackageRestrictionsLocked(userId);

        }

        if (isHomeFilter(filter)) {

            updateDefaultHomeNotLocked(userId);

        }

        postPreferredActivityChangedBroadcast(userId);

    }










@@ -22664,6 +22666,11 @@ 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,