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

Commit 78cc28d9 authored by Hall Liu's avatar Hall Liu Committed by android-build-merger
Browse files

Merge "Start using CarrierConfig for 4G/LTE icon" am: 558535f3 am: e419904a 

am: 322091c7

Change-Id: I356e58af3dfe50a59ffc70b096ece86ece7c5d66
parents 31a59e56 322091c7

src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java

+4 −8
Original line number Diff line number Diff line
@@ -337,14 +337,10 @@ public class SimStatusDialogController implements LifecycleObserver, OnResume, O 
        }



        boolean show4GForLTE = false;

        try {

            final Context con = mContext.createPackageContext(

                    "com.android.systemui", 0 /* flags */);

            final int id = con.getResources().getIdentifier("config_show4GForLTE",

                    "bool" /* default type */, "com.android.systemui" /* default package */);

            show4GForLTE = con.getResources().getBoolean(id);

        } catch (PackageManager.NameNotFoundException e) {

            Log.e(TAG, "NameNotFoundException for show4GForLTE");

        final PersistableBundle carrierConfig = mCarrierConfigManager.getConfigForSubId(subId);

        if (carrierConfig != null) {

            show4GForLTE = carrierConfig.getBoolean(

                    CarrierConfigManager.KEY_SHOW_4G_FOR_LTE_DATA_ICON_BOOL);

        }



        if (show4GForLTE) {