Merge "Consider subId when loading Wfc string resources"

am: 9c2c1b4784 Change-Id: Ib680198aff74daa31d5ca0413ca3dd869b3126af
2019-11-28 07:26:07 -08:00
parent 5ef64ad89b 9c2c1b4784
commit 944689abd6
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);
    }