summaryrefslogtreecommitdiffstats
path: root/telephony/java/com/android
diff options
context:
space:
mode:
authorZach Johnson <zachoverflow@google.com>2015-06-09 00:06:20 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-09 00:06:29 +0000
commitd56958c440dffd85349adee5ca0bf4d0893215c6 (patch)
treefeb579191e0aea393a006b7a621853595da7f0c3 /telephony/java/com/android
parent196597b7c09fce62276099292bb0e3d0572fe4a5 (diff)
parentb4b9ca7580c75f07330e5222cbd9ccc93b12935e (diff)
downloadframeworks_base-d56958c440dffd85349adee5ca0bf4d0893215c6.zip
frameworks_base-d56958c440dffd85349adee5ca0bf4d0893215c6.tar.gz
frameworks_base-d56958c440dffd85349adee5ca0bf4d0893215c6.tar.bz2
Merge "Ignore carrier apps when checking for idleness" into mnc-dev
Diffstat (limited to 'telephony/java/com/android')
-rw-r--r--telephony/java/com/android/internal/telephony/ITelephony.aidl9
1 files changed, 7 insertions, 2 deletions
diff --git a/telephony/java/com/android/internal/telephony/ITelephony.aidl b/telephony/java/com/android/internal/telephony/ITelephony.aidl
index 77f90ab..c253b4f 100644
--- a/telephony/java/com/android/internal/telephony/ITelephony.aidl
+++ b/telephony/java/com/android/internal/telephony/ITelephony.aidl
@@ -740,9 +740,14 @@ interface ITelephony {
int getCarrierPrivilegeStatus();
/**
- * Similar to above, but check for pkg whose name is pkgname.
+ * Similar to above, but check for the package whose name is pkgName.
*/
- int checkCarrierPrivilegesForPackage(String pkgname);
+ int checkCarrierPrivilegesForPackage(String pkgName);
+
+ /**
+ * Similar to above, but check across all phones.
+ */
+ int checkCarrierPrivilegesForPackageAnyPhone(String pkgName);
/**
* Returns list of the package names of the carrier apps that should handle the input intent