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

Commit 93e3ec32 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am e3d89013: am 5c6912c6: Merge "Fix permission check on ContentProvider to be... 

am e3d89013: am 5c6912c6: Merge "Fix permission check on ContentProvider to be multi-user aware." into jb-mr1-dev

* commit 'e3d89013':
  Fix permission check on ContentProvider to be multi-user aware.
parents ec0d899b e3d89013

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;

            }