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

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 43613d0..2cd2f05 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -171,7 +171,6 @@
 import com.android.internal.telephony.uicc.UiccProfile;
 import com.android.internal.telephony.uicc.UiccSlot;
 import com.android.internal.telephony.util.LocaleUtils;
-import com.android.internal.telephony.util.TelephonyResourceUtils;
 import com.android.internal.telephony.util.VoicemailNotificationSettingsUtil;
 import com.android.internal.util.HexDump;
 import com.android.phone.settings.PickSmsSubscriptionActivity;
@@ -8308,10 +8307,8 @@
         //TODO investigate if this API should require proper permission check in R b/133791609
         final long identity = Binder.clearCallingIdentity();
         try {
-            return TelephonyResourceUtils
-                    .getResourcesForSubId(getDefaultPhone().getContext(), subId)
-                    .getString(com.android.telephony.resources.R.string
-                            .config_mms_user_agent_profile_url);
+            return SubscriptionManager.getResourcesForSubId(getDefaultPhone().getContext(), subId)
+                    .getString(com.android.internal.R.string.config_mms_user_agent_profile_url);
         } finally {
             Binder.restoreCallingIdentity(identity);
         }
@@ -8322,9 +8319,8 @@
         //TODO investigate if this API should require proper permission check in R b/133791609
         final long identity = Binder.clearCallingIdentity();
         try {
-            return TelephonyResourceUtils
-                    .getResourcesForSubId(getDefaultPhone().getContext(), subId)
-                    .getString(com.android.telephony.resources.R.string.config_mms_user_agent);
+            return SubscriptionManager.getResourcesForSubId(getDefaultPhone().getContext(), subId)
+                    .getString(com.android.internal.R.string.config_mms_user_agent);
         } finally {
             Binder.restoreCallingIdentity(identity);
         }