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

2020-02-28 02:18:39 +00:00
parent 5688bc3e4c 5533722b9a
commit d3afc9f1d9
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...