summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorMakoto Onuki <omakoto@google.com>2018-09-19 23:11:31 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2018-09-19 23:11:31 +0000
commit04f7af70f32cffe52333dc956cfb72da89a2933a (patch)
treeb0462168f39e5a66aa8931b503cc8264001a16b3 /core/java/android
parent87a97a47eb48bab886f822899abb46c10fb473fc (diff)
parent679760ae66cbf9005be57869dc42cbf2080dfb51 (diff)
Merge "AMS.removeContentProviderExternal() should take a user-id"
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/app/IActivityManager.aidl2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/app/IActivityManager.aidl b/core/java/android/app/IActivityManager.aidl
index 16360b3bf5a8..2490caef1b2f 100644
--- a/core/java/android/app/IActivityManager.aidl
+++ b/core/java/android/app/IActivityManager.aidl
@@ -263,7 +263,9 @@ interface IActivityManager {
void killAllBackgroundProcesses();
ContentProviderHolder getContentProviderExternal(in String name, int userId,
in IBinder token, String tag);
+ /** @deprecated - Use {@link #removeContentProviderExternalAsUser} which takes a user ID. */
void removeContentProviderExternal(in String name, in IBinder token);
+ void removeContentProviderExternalAsUser(in String name, in IBinder token, int userId);
// Get memory information about the calling process.
void getMyMemoryState(out ActivityManager.RunningAppProcessInfo outInfo);
boolean killProcessesBelowForeground(in String reason);