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

Commit 8b9963ab authored by Makoto Onuki's avatar Makoto Onuki
Browse files

Fix "launcher starting on work profile" 

Test: Repeat "adb install -r Velvet.apk" on 5x
Fix 37893215

Change-Id: I1a932fdc7c168542e8b71ca8daffbca9ee534b30
parent 95cf170c

services/core/java/com/android/server/am/ActivityStack.java

+6 −2
Original line number Diff line number Diff line
@@ -1152,11 +1152,15 @@ class ActivityStack<T extends StackWindowController> extends ConfigurationContai 


    void updateActivityApplicationInfoLocked(ApplicationInfo aInfo) {

        final String packageName = aInfo.packageName;

        final int userId = UserHandle.getUserId(aInfo.uid);



        for (int taskNdx = mTaskHistory.size() - 1; taskNdx >= 0; --taskNdx) {

            final List<ActivityRecord> activities = mTaskHistory.get(taskNdx).mActivities;

            for (int activityNdx = activities.size() - 1; activityNdx >= 0; --activityNdx) {

                if (packageName.equals(activities.get(activityNdx).packageName)) {

                    activities.get(activityNdx).info.applicationInfo = aInfo;

                final ActivityRecord ar = activities.get(activityNdx);



                if ((userId == ar.userId) && packageName.equals(ar.packageName)) {

                    ar.info.applicationInfo = aInfo;

                }

            }

        }