diff options
| author | 2012-08-17 17:01:47 -0700 | |
|---|---|---|
| committer | 2012-08-17 17:01:48 -0700 | |
| commit | 5c6912c6f697e34d79447b0cd794a6d9edea72ab (patch) | |
| tree | 230f097bd225cb9bf8c37c545c5f9e45c75b5e56 | |
| parent | 14e883b25e0998e3bc4e574a0df3db252d6e987f (diff) | |
| parent | 0d8af78b748d0279756c1ea8ae1659f6c2c802bb (diff) | |
Merge "Fix permission check on ContentProvider to be multi-user aware." into jb-mr1-dev
| -rw-r--r-- | core/java/android/content/ContentProvider.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/content/ContentProvider.java b/core/java/android/content/ContentProvider.java index 8a69c3af17c8..23d8f46029db 100644 --- a/core/java/android/content/ContentProvider.java +++ b/core/java/android/content/ContentProvider.java @@ -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; } |