Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 56be215b authored by Shishir Agrawal's avatar Shishir Agrawal
Browse files

ITelphony.aidl: Rename hasCarrierPrivileges for packages to checkCarrierPrivilegesForPackage. 

Fixes the build breakage due to overloading in the aidl.

Change-Id: Id3199bf2d21b1834183c90904417ed016d34e052
parent 4d065a04

telephony/java/android/telephony/TelephonyManager.java

+3 −3
Original line number Diff line number Diff line
@@ -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 {

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

+1 −1
Original line number Diff line number Diff line
@@ -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);

}