Merge "Add hidden systemapi hasCarrierPrivileges(pkgname)."

telephony/java/android/telephony/TelephonyManager.java

@@ -2869,6 +2869,19 @@ public class TelephonyManager {
      */
 
     /** @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 {

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

@@ -653,5 +653,10 @@ interface ITelephony {
      * @return carrier privelege status defined in TelephonyManager.
      */
     int hasCarrierPrivileges();
+
+    /**
+     * Similar to above, but check for pkg whose name is pkgname.
+     */
+    int hasCarrierPrivileges(String pkgname);
 }