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

Commit 85653efa authored by Jordan Liu's avatar Jordan Liu Committed by android-build-merger
Browse files

Merge "Do not check the carrier config for BrandOverride" 

am: cb39f7d5

Change-Id: I3494048ce17555094e32de0901c2f75e59ebce23
parents a4d66499 cb39f7d5

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);

    }



    /**