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

Commit 51d4aaba authored by Desterly's avatar Desterly
Browse files

telephony: Remove CdmaLteUicc and CDMA fix 

- CDMALTEPhone/CDMAPhone - remove the Uicc objects for updateCurrentCarrierInProvider and getSubscriberID
  Brings in line with commit https://github.com/CyanogenMod/android_frameworks_opt_telephony/commit/e287feac673ff68565b766e0e463d105fa9cef9d

Change-Id: I83be68398a502cd64b5688164a0c4f11771d896e
parent 22b14a5e

src/java/com/android/internal/telephony/cdma/CDMALTEPhone.java

+2 −2
Original line number Diff line number Diff line
@@ -223,11 +223,11 @@ public class CDMALTEPhone extends CDMAPhone { 


    @Override

    public boolean updateCurrentCarrierInProvider() {

        if (mIccRecords.get() != null) {

        if (mSimRecords != null) {

            try {

                Uri uri = Uri.withAppendedPath(Telephony.Carriers.CONTENT_URI, "current");

                ContentValues map = new ContentValues();

                String operatorNumeric = mIccRecords.get().getOperatorNumeric();

                String operatorNumeric = mSimRecords.getOperatorNumeric();

                map.put(Telephony.Carriers.NUMERIC, operatorNumeric);

                if (DBG) log("updateCurrentCarrierInProvider from UICC: numeric=" +

                        operatorNumeric);

src/java/com/android/internal/telephony/cdma/CDMAPhone.java

+1 −9
Original line number Diff line number Diff line
@@ -525,15 +525,7 @@ public class CDMAPhone extends PhoneBase { 


    @Override

    public String getSubscriberId() {

        if (mCdmaSubscriptionSource == CDMA_SUBSCRIPTION_NV) {

        return mSST.getNvImsi();

        } else {

            IccRecords r = mIccRecords.get();

            if (r != null) {

                return r.getIMSI();

            }

        }

        return null;

    }



    @Override