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

Commit ee990920 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

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

Merge "Fixes wrong id when granting provider access" into rvc-dev am: d3afc9f1 am: eec9ed09 am: 2592e42a

Change-Id: I7c73e24c1acca4c6dd8d0dab34e79dc9e8b1f370
parents 39b95675 2592e42a

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

+2 −4
Original line number Diff line number Diff line
@@ -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...