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

Commit d30570e2 authored by Hai Zhang's avatar Hai Zhang Committed by Guang Zhu
Browse files

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

This reverts commit cac5c681.

Reason for revert: Broke build
Bug: 178191941

Change-Id: Idd8d4e3421fe2f9df1165974359fc2f4294a9725
parent cac5c681

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

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

        }

        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,