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

Commit feafab6f authored by Jordan Liu's avatar Jordan Liu
Browse files

Do not check the carrier config for BrandOverride 

This method is meant to return the PLMN operator name, which can be
overwritten by setOperatorBrandOverride but not the carrier config.

Bug: 31784938
Bug: 77461054
Test: manual
Change-Id: Ia5f842411a947beff8ce9f1b3d51f4455397c020
Merged-In: Ia5f842411a947beff8ce9f1b3d51f4455397c020
parent ad228a6d

src/java/com/android/internal/telephony/uicc/UiccProfile.java

+1 −15
Original line number Diff line number Diff line
@@ -1457,21 +1457,7 @@ public class UiccProfile extends IccCard { 
            return null;

        }

        SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(mContext);

        String brandName = sp.getString(OPERATOR_BRAND_OVERRIDE_PREFIX + iccId, null);

        if (brandName == null) {

            // Check if  CarrierConfig sets carrier name

            CarrierConfigManager manager = (CarrierConfigManager)

                    mContext.getSystemService(Context.CARRIER_CONFIG_SERVICE);

            int subId = SubscriptionController.getInstance().getSubIdUsingPhoneId(mPhoneId);

            if (manager != null) {

                PersistableBundle bundle = manager.getConfigForSubId(subId);

                if (bundle != null && bundle.getBoolean(

                        CarrierConfigManager.KEY_CARRIER_NAME_OVERRIDE_BOOL)) {

                    brandName = bundle.getString(CarrierConfigManager.KEY_CARRIER_NAME_STRING);

                }

            }

        }

        return brandName;

        return sp.getString(OPERATOR_BRAND_OVERRIDE_PREFIX + iccId, null);

    }



    /**