commit e419904aa0e174697aab5bede22cfe31caef13f4
author Hall Liu <hallliu@google.com> Thu Oct 18 14:56:56 2018 -0700
committer android-build-merger <android-build-merger@google.com> Thu Oct 18 14:56:56 2018 -0700
tree 9ca6626fa98e5b372547b77af1005d0a7d92da5a
parent 81edd9a286daf8f1fd0837d1b0db535c683dada7
parent 558535f3f20a69681a6926563afa44d5888ef169

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

Change-Id: I9bb6a91c0c3a79f4b3fae4d50c431e0286b8c06f

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

diff --git a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
index 114e4e4..2a682d2 100644
--- a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
+++ b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
@@ -337,14 +337,10 @@
         }
 
         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) {