Merge "Consider subId when loading Wfc string resources" am: 9c2c1b4784 am: 944689abd6

am: 6c1861b3c0 Change-Id: I3d8c02c344d0aa70952dca9aac6597ca6b36a4db
2019-11-28 07:30:09 -08:00
parent 702cc1d223 6c1861b3c0
commit 9b26611ce1
3 changed files with 75 additions and 35 deletions
--- a/src/com/android/settings/network/telephony/WifiCallingPreferenceController.java
+++ b/src/com/android/settings/network/telephony/WifiCallingPreferenceController.java
@@ -148,7 +148,8 @@ public class WifiCallingPreferenceController extends TelephonyBasePreferenceCont
                        break;
                }
            }
-            preference.setSummary(resId);
+            preference.setSummary(
+                    SubscriptionManager.getResourcesForSubId(mContext, mSubId).getText(resId));
        }
        preference.setEnabled(mCallState == TelephonyManager.CALL_STATE_IDLE);
    }