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

Commit 3454cdda authored by Calvin Pan's avatar Calvin Pan Committed by android-build-merger
Browse files

Merge "Create new API for MNO carrier id" 

am: 56ff623f

Change-Id: I9e8292be6fe778b8d34cf325bffc1673c7bdd993
parents 2e8be297 56ff623f

src/java/com/android/internal/telephony/GsmCdmaPhone.java

+5 −0
Original line number Diff line number Diff line
@@ -1574,6 +1574,11 @@ public class GsmCdmaPhone extends Phone { 
        return mCarrerResolver.getCarrierName();

    }



    @Override

    public int getMNOCarrierId() {

        return mCarrerResolver.getMnoCarrierId();

    }



    @Override

    public int getCarrierIdListVersion() {

        return mCarrerResolver.getCarrierListVersion();

src/java/com/android/internal/telephony/Phone.java

+4 −0
Original line number Diff line number Diff line
@@ -3113,6 +3113,10 @@ public abstract class Phone extends Handler implements PhoneInternalInterface { 
        return null;

    }



    public int getMNOCarrierId() {

        return TelephonyManager.UNKNOWN_CARRIER_ID;

    }



    public int getCarrierIdListVersion() {

        return TelephonyManager.UNKNOWN_CARRIER_ID_LIST_VERSION;

    }