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

Commit 1b6b9447 authored by Sanket Padawe's avatar Sanket Padawe Committed by Steve Kondik
Browse files

Set carrierName of subInfo to null while creating/updating subInfo. 

Bug: 19476304
Change-Id: Ia16465584cf31858bbf1ae36cfdbf21184de10d7
parent c2912809

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

+2 −11
Original line number Diff line number Diff line
@@ -710,10 +710,7 @@ public class SubscriptionController extends ISub.Stub { 
        }



        String nameToSet;

        String CarrierName = TelephonyManager.getDefault().getSimOperator(subIds[0]);

        if (DBG) logdl("[addSubInfoRecord] CarrierName = " + CarrierName);

        String simCarrierName =

                TelephonyManager.getDefault().getSimOperatorNameForSubscription(subIds[0]);

        String simCarrierName = mTelephonyManager.getSimOperatorNameForSubscription(subIds[0]);



        if (!TextUtils.isEmpty(simCarrierName)) {

            nameToSet = simCarrierName;
@@ -742,9 +739,7 @@ public class SubscriptionController extends ISub.Stub { 
                value.put(SubscriptionManager.COLOR, color);

                value.put(SubscriptionManager.SIM_SLOT_INDEX, slotId);

                value.put(SubscriptionManager.DISPLAY_NAME, nameToSet);

                value.put(SubscriptionManager.CARRIER_NAME,

                        !TextUtils.isEmpty(simCarrierName) ? simCarrierName :

                        mContext.getString(com.android.internal.R.string.unknownName));

                value.put(SubscriptionManager.CARRIER_NAME, "");

                Uri uri = resolver.insert(SubscriptionManager.CONTENT_URI, value);

                if (DBG) logdl("[addSubInfoRecord] New record created: " + uri);

            } else {
@@ -772,10 +767,6 @@ public class SubscriptionController extends ISub.Stub { 
                    }

                }



                if (!TextUtils.isEmpty(simCarrierName)) {

                    value.put(SubscriptionManager.CARRIER_NAME, simCarrierName);

                }



                if (value.size() > 0) {

                    resolver.update(SubscriptionManager.CONTENT_URI, value,

                            SubscriptionManager.UNIQUE_KEY_SUBSCRIPTION_ID +

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

+4 −11
Original line number Diff line number Diff line
@@ -400,10 +400,7 @@ public class SubscriptionInfoUpdater extends Handler { 


            SubscriptionInfo subInfo = mSubscriptionManager.getActiveSubscriptionInfo(subId);

            String nameToSet;

            String CarrierName = TelephonyManager.getDefault().getSimOperator(subId);

            logd("CarrierName = " + CarrierName);

            String simCarrierName = TelephonyManager.getDefault()

                    .getSimOperatorNameForSubscription(subId);

            String simCarrierName = mTelephonyMgr.getSimOperatorNameForSubscription(subId);

            ContentValues name = new ContentValues(1);



            if (subInfo != null && subInfo.getNameSource() !=
@@ -415,14 +412,10 @@ public class SubscriptionInfoUpdater extends Handler { 
                }

                name.put(SubscriptionManager.DISPLAY_NAME, nameToSet);

                logd("sim name = " + nameToSet);

            }

            name.put(SubscriptionManager.CARRIER_NAME,

                    !TextUtils.isEmpty(simCarrierName) ? simCarrierName :

                    mContext.getString(com.android.internal.R.string.unknownName));

                contentResolver.update(SubscriptionManager.CONTENT_URI, name,

                        SubscriptionManager.UNIQUE_KEY_SUBSCRIPTION_ID

                        + "=" + Long.toString(subId), null);

            logd("carrier name = " + simCarrierName);

            }



        } else {

            logd("Invalid subId, could not update ContentResolver");