commit 6acceb3cd13ee9dc39b240a30179b325084c2395
author Brad Ebinger <breadley@google.com> Wed Apr 10 17:33:20 2019 -0700
committer Brad Ebinger <breadley@google.com> Thu Apr 11 00:37:37 2019 +0000
tree 0fb167ed32fbe26e6eb4b85a304a8dd4505fac0d
parent b3467600454ae96ba05947413de4c51edc7ac070

Merge "Fix issue that user can't edit WFC mode for SIM2" am: d2727d5d9f
am: c91d33798b

Bug: 117193148
Test: manual CP
Merged-In: Icb3bd924f9e8e3e2e82845ab85ef25c2e38e13dc
Change-Id: Icb3bd924f9e8e3e2e82845ab85ef25c2e38e13dc
(cherry picked from commit ac4a495fc23ed7931d6c6ca956c20f9024e48ed7)

src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java

diff --git a/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java b/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java
index 525b59b..252193d 100644
--- a/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java
+++ b/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java
@@ -122,7 +122,8 @@
             final CarrierConfigManager configManager = (CarrierConfigManager)
                     activity.getSystemService(Context.CARRIER_CONFIG_SERVICE);
             if (configManager != null) {
-                PersistableBundle b = configManager.getConfigForSubId(mSubId);
+                PersistableBundle b =
+                        configManager.getConfigForSubId(WifiCallingSettingsForSub.this.mSubId);
                 if (b != null) {
                     isWfcModeEditable = b.getBoolean(
                             CarrierConfigManager.KEY_EDITABLE_WFC_MODE_BOOL);