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

Commit 1d04bff7 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: I17d59c418f8c2eb5e51255b66b1594464c650ba3
parents ee239f26 a2547e30

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 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,