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/CallNotifier.java

diff --git a/src/com/android/phone/CallNotifier.java b/src/com/android/phone/CallNotifier.java
index a609f98..5b14591 100644
--- a/src/com/android/phone/CallNotifier.java
+++ b/src/com/android/phone/CallNotifier.java
@@ -43,7 +43,6 @@
 import com.android.internal.telephony.cdma.CdmaInformationRecords.CdmaDisplayInfoRec;
 import com.android.internal.telephony.cdma.CdmaInformationRecords.CdmaSignalInfoRec;
 import com.android.internal.telephony.cdma.SignalToneUtil;
-import com.android.internal.telephony.util.TelephonyResourceUtils;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -653,16 +652,16 @@
         int resId = 0;
         switch (((Integer)r.result).intValue()) {
             case TelecomManager.TTY_MODE_FULL:
-                resId = com.android.telephony.resources.R.string.peerTtyModeFull;
+                resId = com.android.internal.R.string.peerTtyModeFull;
                 break;
             case TelecomManager.TTY_MODE_HCO:
-                resId = com.android.telephony.resources.R.string.peerTtyModeHco;
+                resId = com.android.internal.R.string.peerTtyModeHco;
                 break;
             case TelecomManager.TTY_MODE_VCO:
-                resId = com.android.telephony.resources.R.string.peerTtyModeVco;
+                resId = com.android.internal.R.string.peerTtyModeVco;
                 break;
             case TelecomManager.TTY_MODE_OFF:
-                resId = com.android.telephony.resources.R.string.peerTtyModeOff;
+                resId = com.android.internal.R.string.peerTtyModeOff;
                 break;
             default:
                 Log.e(LOG_TAG, "Unsupported TTY mode: " + r.result);
@@ -670,7 +669,7 @@
         }
         if (resId != 0) {
             PhoneDisplayMessage.displayNetworkMessage(mApplication,
-                    TelephonyResourceUtils.getTelephonyResources(mApplication).getString(resId));
+                    mApplication.getResources().getString(resId));
 
             // start a timer that kills the dialog
             sendEmptyMessageDelayed(INTERNAL_SHOW_MESSAGE_NOTIFICATION_DONE,