Merge "Fixes wrong id when granting provider access" into rvc-dev am: d3afc9f1d9

Change-Id: Iff0b8b2e38b44bc44e0a6574e1cd1e1bc51f5abf
2020-02-28 02:29:20 +00:00
parent 69d008c9c7 d3afc9f1d9
commit eec9ed09fa
1 changed files with 2 additions and 4 deletions
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -7267,10 +7267,8 @@ public class ActivityManagerService extends IActivityManager.Stub
            }
            checkTime(startTime, "getContentProviderImpl: done!");

-            grantImplicitAccess(userId, null /*intent*/,
-                    UserHandle.getAppId(Binder.getCallingUid()),
-                    UserHandle.getAppId(cpi.applicationInfo.uid)
-            );
+            grantImplicitAccess(userId, null /*intent*/, callingUid,
+                    UserHandle.getAppId(cpi.applicationInfo.uid));
        }

        // Wait for the provider to be published...