From 56be215bcc5df95447c49d99915c299965b44207 Mon Sep 17 00:00:00 2001
From: Shishir Agrawal <shishir@google.com>
Date: Fri, 11 Jul 2014 16:30:32 -0700
Subject: [PATCH] ITelphony.aidl: Rename hasCarrierPrivileges for packages to
 checkCarrierPrivilegesForPackage.

Fixes the build breakage due to overloading in the aidl.

Change-Id: Id3199bf2d21b1834183c90904417ed016d34e052
---
 telephony/java/android/telephony/TelephonyManager.java      | 6 +++---
 .../java/com/android/internal/telephony/ITelephony.aidl     | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 4a9ea2e38d01d..f136292ac88b0 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -2870,9 +2870,9 @@ public class TelephonyManager {
 
     /** @hide */
     @SystemApi
-    public int hasCarrierPrivileges(String pkgname) {
+    public int checkCarrierPrivilegesForPackage(String pkgname) {
         try {
-            return getITelephony().hasCarrierPrivileges(pkgname);
+            return getITelephony().checkCarrierPrivilegesForPackage(pkgname);
         } catch (RemoteException ex) {
             Rlog.e(TAG, "hasCarrierPrivileges RemoteException", ex);
         } catch (NullPointerException ex) {
@@ -2880,8 +2880,8 @@ public class TelephonyManager {
         }
         return CARRIER_PRIVILEGE_STATUS_NO_ACCESS;
     }
-    /** @hide */
 
+    /** @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 3100d183ee3d6..72c5ffc434279 100644
--- a/telephony/java/com/android/internal/telephony/ITelephony.aidl
+++ b/telephony/java/com/android/internal/telephony/ITelephony.aidl
@@ -657,6 +657,6 @@ interface ITelephony {
     /**
      * Similar to above, but check for pkg whose name is pkgname.
      */
-    int hasCarrierPrivileges(String pkgname);
+    int checkCarrierPrivilegesForPackage(String pkgname);
 }