commit ebb4eb7ccb9811896b6a373781f39583ea5d020f
author Daniel Bright <dbright@google.com> Tue Feb 18 15:16:33 2020 -0800
committer Daniel Bright <dbright@google.com> Tue Feb 18 15:36:31 2020 -0800
tree 4887391ff4b8f8fcb3e4c5a6e085ab2b3b389821
parent 9c84a604764b897e27ca66cb7edc42976898b14a

Rollback telephony resources on telephony service

Bug: 149776042
Test: TeleServiceTests
Change-Id: I8f08a553e4fe42389bbcb8d13893985b40c159eb

src/com/android/phone/NotificationMgr.java

diff --git a/src/com/android/phone/NotificationMgr.java b/src/com/android/phone/NotificationMgr.java
index 19ce2f1..6f7022f 100644
--- a/src/com/android/phone/NotificationMgr.java
+++ b/src/com/android/phone/NotificationMgr.java
@@ -60,7 +60,6 @@
 import com.android.internal.telephony.PhoneFactory;
 import com.android.internal.telephony.TelephonyCapabilities;
 import com.android.internal.telephony.util.NotificationChannelController;
-import com.android.internal.telephony.util.TelephonyResourceUtils;
 import com.android.phone.settings.VoicemailSettingsActivity;
 
 import java.util.ArrayList;
@@ -818,10 +817,8 @@
                 boolean isManualSelection;
                 // if restoring manual selection is controlled by framework, then get network
                 // selection from shared preference, otherwise get from real network indicators.
-                boolean restoreSelection = !TelephonyResourceUtils.getTelephonyResources(mContext)
-                        .getBoolean(
-                            com.android.telephony.resources.R.bool
-                                .skip_restoring_network_selection);
+                boolean restoreSelection = !mContext.getResources().getBoolean(
+                        com.android.internal.R.bool.skip_restoring_network_selection);
                 if (restoreSelection) {
                     isManualSelection = !TextUtils.isEmpty(selectedNetworkOperatorName);
                 } else {