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

Commit 89f29261 authored by Songchun Fan's avatar Songchun Fan
Browse files

[am] resolve service again when resetting userId in retrieveServiceLocked() 

Test: manual and no incorrect
isLoadedApkResourceDirsUpToDate() results during work profile setup

BUG: 149410951
Change-Id: If40f37612a794b8850b71ab9edbe13682c8fa05f
parent dcd5bcaf

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

+10 −0
Original line number Diff line number Diff line
@@ -2460,6 +2460,16 @@ public final class ActiveServices { 
                            && mAm.isValidSingletonCall(callingUid, sInfo.applicationInfo.uid)) {

                        userId = 0;

                        smap = getServiceMapLocked(0);

                        ResolveInfo rInfoForUserId0 =

                                mAm.getPackageManagerInternalLocked().resolveService(service,

                                        resolvedType, flags, userId, callingUid);

                        if (rInfoForUserId0 == null) {

                            Slog.w(TAG_SERVICE,

                                    "Unable to resolve service " + service + " U=" + userId

                                            + ": not found");

                            return null;

                        }

                        sInfo = rInfoForUserId0.serviceInfo;

                    }

                    sInfo = new ServiceInfo(sInfo);

                    sInfo.applicationInfo = mAm.getAppInfoForUser(sInfo.applicationInfo, userId);