summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@google.com>2016-12-02 18:10:03 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-12-02 18:10:14 +0000
commit48f6bdfce48c57a224d7e4bbbc3ab566ef24ce37 (patch)
treebaf5f9165ca5e78344cdf00049019bd8d6270a37 /core/java
parenta0b41fca4063197c34a82d9d86c68f610afd7ee4 (diff)
parentff2fede0ddd9464d4c65e6218a032036adb73099 (diff)
Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev
Diffstat (limited to 'core/java')
-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 40eb799f26b9..579b307efac6 100644
--- a/core/java/android/app/ActivityManagerInternal.java
+++ b/core/java/android/app/ActivityManagerInternal.java
@@ -25,6 +25,11 @@ import android.content.ComponentName;
* @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);