From 8fdf33d50a970107cc696ae6f8f9b0c1ecd40ee8 Mon Sep 17 00:00:00 2001 From: Niklas Lindgren Date: Fri, 21 Sep 2018 14:23:07 +0200 Subject: [PATCH] Start using CarrierConfig for 4G/LTE icon Icon will be updated on sim swap or in case the default data SIM changes. Test: Add configs in vendor xml and swap between sim cards. Tested on both single sim and dual sim. Bug: 113309356 Change-Id: I1847bcb4e6c1b6dcef7b14bce14f91bd3e4734a5 --- .../simstatus/SimStatusDialogController.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java index 9cea62d1e31..f273689abda 100644 --- a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java +++ b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java @@ -338,14 +338,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) {