commit 02c5196ec87ab9134f1e2b3ee5b58a6ec4cdb877
author Brad Ebinger <breadley@google.com> Mon Apr 29 15:55:40 2019 -0700
committer Brad Ebinger <breadley@google.com> Mon May 06 22:00:10 2019 +0000
tree 84d2999504a006764aca9a3446497dd5e4dbb4ee
parent 1da57acea4ea1e6bc4d43777c3b8c76d946c1a70

Include subid in WiFi calling intent to settings

Include the subid extra in intent to start
WifiCallingSettingsActivity in order to have it load
the tab containing the correct WiFi calling information.

Bug: 117135894
Test: Manual
Merged-In: If0e7f6ac22b5255762e52eef4308a55a1077ae1a
Change-Id: Idc83d496ae3262ae31a546c4c85eed6124ba3243

src/com/android/phone/CallFeaturesSetting.java

diff --git a/src/com/android/phone/CallFeaturesSetting.java b/src/com/android/phone/CallFeaturesSetting.java
index 0cb93aa..629276e 100644
--- a/src/com/android/phone/CallFeaturesSetting.java
+++ b/src/com/android/phone/CallFeaturesSetting.java
@@ -410,6 +410,10 @@
                 }
             }
             mButtonWifiCalling.setSummary(resId);
+            Intent intent = mButtonWifiCalling.getIntent();
+            if (intent != null) {
+                intent.putExtra(Settings.EXTRA_SUB_ID, mPhone.getSubId());
+            }
             prefSet.addPreference(mButtonWifiCalling);
         }