summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2016-12-02 18:19:51 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-12-02 18:19:51 +0000
commit792d49dfb50587dbda95f5f681d80501519631cd (patch)
tree952c952caf9c81359994ad899f89076571ec6d22 /core/java
parent8bd3aa70ad3397708eab406418de8d003748213d (diff)
parent91add43ae7d31d9f2ccd9a2e7a692289ea4d258f (diff)
DO NOT MERGE. Check provider access for content changes.
am: 91add43ae7 Change-Id: I158a5dab0643fb5d2c07393f0df030e93b3c006a
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 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);