diff options
author | Dianne Hackborn <hackbod@google.com> | 2010-08-18 15:59:05 -0700 |
---|---|---|
committer | Dianne Hackborn <hackbod@google.com> | 2010-08-18 16:07:35 -0700 |
commit | b424b633bb3664bed924d2ea89036290a57eb2bd (patch) | |
tree | 81276872465064d4d1e4957192644bbc6198a9fa /core/java/android/content/ContentProvider.java | |
parent | 6b2c56a299eb05deef2b887549e29e9e9f0f2cf6 (diff) | |
download | frameworks_base-b424b633bb3664bed924d2ea89036290a57eb2bd.zip frameworks_base-b424b633bb3664bed924d2ea89036290a57eb2bd.tar.gz frameworks_base-b424b633bb3664bed924d2ea89036290a57eb2bd.tar.bz2 |
Fix issue #2845673: android:exported="false" is not obeyed
Thou shall obey.
Change-Id: I09f163a0db7cc9189c8d7f5116cc8ca9d4f7a76c
Diffstat (limited to 'core/java/android/content/ContentProvider.java')
-rw-r--r-- | core/java/android/content/ContentProvider.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/core/java/android/content/ContentProvider.java b/core/java/android/content/ContentProvider.java index 9b9f796..dc4e9c4 100644 --- a/core/java/android/content/ContentProvider.java +++ b/core/java/android/content/ContentProvider.java @@ -86,6 +86,7 @@ public abstract class ContentProvider implements ComponentCallbacks { private String mReadPermission; private String mWritePermission; private PathPermission[] mPathPermissions; + private boolean mExported; private Transport mTransport = new Transport(); @@ -257,9 +258,9 @@ public abstract class ContentProvider implements ComponentCallbacks { final Context context = getContext(); final String rperm = getReadPermission(); final int pid = Binder.getCallingPid(); - if (rperm == null + if (mExported && (rperm == null || context.checkPermission(rperm, pid, uid) - == PackageManager.PERMISSION_GRANTED) { + == PackageManager.PERMISSION_GRANTED)) { return; } @@ -303,9 +304,9 @@ public abstract class ContentProvider implements ComponentCallbacks { final Context context = getContext(); final String wperm = getWritePermission(); final int pid = Binder.getCallingPid(); - if (wperm == null + if (mExported && (wperm == null || context.checkPermission(wperm, pid, uid) - == PackageManager.PERMISSION_GRANTED) { + == PackageManager.PERMISSION_GRANTED)) { return true; } @@ -786,6 +787,7 @@ public abstract class ContentProvider implements ComponentCallbacks { setReadPermission(info.readPermission); setWritePermission(info.writePermission); setPathPermissions(info.pathPermissions); + mExported = info.exported; } ContentProvider.this.onCreate(); } |