summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@google.com>2016-12-02 18:10:04 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-12-02 18:10:16 +0000
commit6b89229d1475e7791318caed5b2063c49ed99744 (patch)
treeb1faf9e62850c26205d30f9fd08ea27939121756 /core/java/android
parent704085119db359d2e1d6f04600ac7ff2a0ec83e9 (diff)
parent91add43ae7d31d9f2ccd9a2e7a692289ea4d258f (diff)
Merge "DO NOT MERGE. Check provider access for content changes." into lmp-mr1-dev
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/app/ActivityManagerInternal.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/core/java/android/app/ActivityManagerInternal.java b/core/java/android/app/ActivityManagerInternal.java
index d56dc1e07f52..44b564cb885c 100644
--- a/core/java/android/app/ActivityManagerInternal.java
+++ b/core/java/android/app/ActivityManagerInternal.java
@@ -22,6 +22,11 @@ package android.app;
* @hide Only for use within the system server.
*/
public abstract class ActivityManagerInternal {
+ /**
+ * Verify that calling app has access to the given provider.
+ */
+ public abstract String checkContentProviderAccess(String authority, int userId);
+
// Called by the power manager.
public abstract void onWakefulnessChanged(int wakefulness);