From 142529702dad9a6612271f487d500db80173ba7b Mon Sep 17 00:00:00 2001
From: Junda Liu <junda@google.com>
Date: Thu, 10 Jul 2014 15:19:03 -0700
Subject: [PATCH] Add hidden systemapi hasCarrierPrivileges(pkgname).

Change-Id: I153f5c7cff1734c87587c3741051177ce54ba654
---
 .../java/android/telephony/TelephonyManager.java    | 13 +++++++++++++
 .../com/android/internal/telephony/ITelephony.aidl  |  5 +++++
 2 files changed, 18 insertions(+)

diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 15320e6b5c12a..4a9ea2e38d01d 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/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 {
diff --git a/telephony/java/com/android/internal/telephony/ITelephony.aidl b/telephony/java/com/android/internal/telephony/ITelephony.aidl
index 7bf3b3fd97b32..3100d183ee3d6 100644
--- a/telephony/java/com/android/internal/telephony/ITelephony.aidl
+++ b/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);
 }