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

Commit 5c6912c6 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Fix permission check on ContentProvider to be multi-user aware." into jb-mr1-dev

parents 14e883b2 0d8af78b

core/java/android/content/ContentProvider.java

+2 −2
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ public abstract class ContentProvider implements ComponentCallbacks2 { 
            final int uid = Binder.getCallingUid();

            String missingPerm = null;



            if (uid == mMyUid) {

            if (UserHandle.isSameApp(uid, mMyUid)) {

                return;

            }
@@ -340,7 +340,7 @@ public abstract class ContentProvider implements ComponentCallbacks2 { 
            final int uid = Binder.getCallingUid();

            String missingPerm = null;



            if (uid == mMyUid) {

            if (UserHandle.isSameApp(uid, mMyUid)) {

                return;

            }