summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorNate Myren <ntmyren@google.com>2021-08-05 16:59:04 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-08-05 16:59:04 +0000
commitdcd809e7cd62663ebc268d79313525137eecdf7e (patch)
tree6182814cd01828ce4f7c32995f34f7831f26c4aa /core/java/android
parent89abfb36eb962db2c5e3c60b29999121d1b9c30f (diff)
parentc2c1c0341b91bd2c2f5f4200921f14475c72e468 (diff)
Merge "Remove calling UID check from ContentProvider" into sc-dev am: c2c1c0341b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15463733 Change-Id: I44bc8d19e6877cbfbf5cf54b9cb9dbcd8db35cd9
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/content/ContentProvider.java3
1 files changed, 0 insertions, 3 deletions
diff --git a/core/java/android/content/ContentProvider.java b/core/java/android/content/ContentProvider.java
index a741f9649b4c..c714f507242e 100644
--- a/core/java/android/content/ContentProvider.java
+++ b/core/java/android/content/ContentProvider.java
@@ -745,9 +745,6 @@ public abstract class ContentProvider implements ContentInterface, ComponentCall
if (Binder.getCallingPid() == Process.myPid()) {
return PermissionChecker.PERMISSION_GRANTED;
}
- if (!attributionSource.checkCallingUid()) {
- return PermissionChecker.PERMISSION_HARD_DENIED;
- }
return PermissionChecker.checkPermissionForDataDeliveryFromDataSource(getContext(),
permission, -1, new AttributionSource(getContext().getAttributionSource(),
attributionSource), /*message*/ null);