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

Commit 6bebe24d authored by Baligh Uddin's avatar Baligh Uddin Committed by Automerger Merge Worker
Browse files

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

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

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

Change-Id: I0437279945a945243839c4b8d2d69d61b2ac76af
parents f0814d24 7e7c76c8

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

+2 −9
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 (!(isHomeFilter(filter) && updateDefaultHomeNotLocked(userId))) {

        if (!updateDefaultHomeNotLocked(userId)) {

            postPreferredActivityChangedBroadcast(userId);

        }

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

            scheduleWritePackageRestrictionsLocked(userId);

        }

        if (isHomeFilter(filter)) {

        updateDefaultHomeNotLocked(userId);

        }

        postPreferredActivityChangedBroadcast(userId);

    }










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