Merge "[am] resolve service again when resetting userId in retrieveServiceLocked()" into rvc-dev am: 1aced77c2e

Change-Id: I75396a31978c9f12e7273e89bcc12b596314fb7b
2020-05-29 23:00:13 +00:00
parent 6a68dfc8aa 1aced77c2e
commit fc25cbb078
1 changed files with 10 additions and 0 deletions
--- a/services/core/java/com/android/server/am/ActiveServices.java
+++ b/services/core/java/com/android/server/am/ActiveServices.java
@@ -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);