commit 142529702dad9a6612271f487d500db80173ba7b
author Junda Liu <junda@google.com> Thu Jul 10 15:19:03 2014 -0700
committer Junda Liu <junda@google.com> Fri Jul 11 15:54:17 2014 -0700
tree 5b34edf5d9bf1e57aea90013c8013d61b9701965
parent c344f9b800a41bedf2ff51547dad02912c71e180

Add hidden systemapi hasCarrierPrivileges(pkgname).

Change-Id: I153f5c7cff1734c87587c3741051177ce54ba654

telephony/java/android/telephony/TelephonyManager.java

diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 15320e6..4a9ea2e 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -2870,6 +2870,19 @@
 
     /** @hide */
     @SystemApi
+    public int hasCarrierPrivileges(String pkgname) {
+        try {
+            return getITelephony().hasCarrierPrivileges(pkgname);
+        } catch (RemoteException ex) {
+            Rlog.e(TAG, "hasCarrierPrivileges RemoteException", ex);
+        } catch (NullPointerException ex) {
+            Rlog.e(TAG, "hasCarrierPrivileges NPE", ex);
+        }
+        return CARRIER_PRIVILEGE_STATUS_NO_ACCESS;
+    }
+    /** @hide */
+
+    @SystemApi
     public void dial(String number) {
         try {
             getITelephony().dial(number);

telephony/java/com/android/internal/telephony/ITelephony.aidl

diff --git a/telephony/java/com/android/internal/telephony/ITelephony.aidl b/telephony/java/com/android/internal/telephony/ITelephony.aidl
index 7bf3b3f..3100d18 100644
--- a/telephony/java/com/android/internal/telephony/ITelephony.aidl
+++ b/telephony/java/com/android/internal/telephony/ITelephony.aidl
@@ -653,5 +653,10 @@
      * @return carrier privelege status defined in TelephonyManager.
      */
     int hasCarrierPrivileges();
+
+    /**
+     * Similar to above, but check for pkg whose name is pkgname.
+     */
+    int hasCarrierPrivileges(String pkgname);
 }