summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorBrad Ebinger <breadley@google.com>2017-02-01 19:42:16 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-02-01 19:42:16 +0000
commit3aaf673c60377fdff72fe1ab17099083f5fe9622 (patch)
tree0efe01f275325ce9c2116c5eae3730853ee5b812 /core/java/android
parentda5289b6ed28ca0e39e2b1effed40b585343cd97 (diff)
parentfa1dca0ad61af079c7653ba80d847a5b51df343c (diff)
Merge "Adds @hide permission granting API for ImsServices" am: 390ec27f9d am: 6734275c2f
am: fa1dca0ad6 Change-Id: Id2875b5b60401405e31e76eb07968798144df700
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/content/pm/IPackageManager.aidl1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/content/pm/IPackageManager.aidl b/core/java/android/content/pm/IPackageManager.aidl
index f35b13d44474..c51945e4e27d 100644
--- a/core/java/android/content/pm/IPackageManager.aidl
+++ b/core/java/android/content/pm/IPackageManager.aidl
@@ -563,6 +563,7 @@ interface IPackageManager {
void addOnPermissionsChangeListener(in IOnPermissionsChangeListener listener);
void removeOnPermissionsChangeListener(in IOnPermissionsChangeListener listener);
void grantDefaultPermissionsToEnabledCarrierApps(in String[] packageNames, int userId);
+ void grantDefaultPermissionsToEnabledImsServices(in String[] packageNames, int userId);
boolean isPermissionRevokedByPolicy(String permission, String packageName, int userId);