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

Commit 542cf540 authored by Hai Zhang's avatar Hai Zhang
Browse files

Update default home after preferred activity is changed. 

Or the update won't find any change for preferred activity.

Bug: 132208447
Test: presubmit
Change-Id: Ic8e0173518efefec033ab39a9e6697f8c862dd60
parent 895d5c54

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

+5 −5
Original line number Original line Diff line number Diff line
@@ -20096,14 +20096,14 @@ public class PackageManagerService extends IPackageManager.Stub 
                    + userId + ":");

                    + userId + ":");

            filter.dump(new LogPrinter(Log.INFO, TAG), "  ");

            filter.dump(new LogPrinter(Log.INFO, TAG), "  ");

        }

        }

        if (!updateDefaultHomeNotLocked(userId)) {

            postPreferredActivityChangedBroadcast(userId);

        }

        synchronized (mPackages) {

        synchronized (mPackages) {

            final PreferredIntentResolver pir = mSettings.editPreferredActivitiesLPw(userId);

            final PreferredIntentResolver pir = mSettings.editPreferredActivitiesLPw(userId);

            pir.addFilter(new PreferredActivity(filter, match, set, activity, always));

            pir.addFilter(new PreferredActivity(filter, match, set, activity, always));

            scheduleWritePackageRestrictionsLocked(userId);

            scheduleWritePackageRestrictionsLocked(userId);

        }

        }

        if (!updateDefaultHomeNotLocked(userId)) {

            postPreferredActivityChangedBroadcast(userId);

        }

    }

    }

















    private void postPreferredActivityChangedBroadcast(int userId) {







    private void postPreferredActivityChangedBroadcast(int userId) {










@@ -20418,13 +20418,13 @@ public class PackageManagerService extends IPackageManager.Stub









                    + " for user " + userId + ":");







                    + " for user " + userId + ":");











            filter.dump(new LogPrinter(Log.INFO, TAG), "  ");







            filter.dump(new LogPrinter(Log.INFO, TAG), "  ");











        }







        }











        updateDefaultHomeNotLocked(userId);














        postPreferredActivityChangedBroadcast(userId);














        synchronized (mPackages) {







        synchronized (mPackages) {











            mSettings.editPersistentPreferredActivitiesLPw(userId).addFilter(







            mSettings.editPersistentPreferredActivitiesLPw(userId).addFilter(











                    new PersistentPreferredActivity(filter, activity));







                    new PersistentPreferredActivity(filter, activity));











            scheduleWritePackageRestrictionsLocked(userId);







            scheduleWritePackageRestrictionsLocked(userId);











        }







        }














        updateDefaultHomeNotLocked(userId);














        postPreferredActivityChangedBroadcast(userId);











    }







    }



























    @Override







    @Override