DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master

Bug: 151763422 Change-Id: I2f38724f862817185ae93dd79736791540251a60
2020-03-19 10:10:41 -07:00
parent 51c080aaf9 94f905bd9d
commit 0cad441364
97 changed files with 329840 additions and 330251 deletions
--- a/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceController.java
+++ b/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceController.java
@@ -88,6 +88,8 @@ public class PreferredNetworkModePreferenceController extends TelephonyBasePrefe
            Settings.Global.putInt(mContext.getContentResolver(),
                    Settings.Global.PREFERRED_NETWORK_MODE + mSubId,
                    settingsMode);
+            final ListPreference listPreference = (ListPreference) preference;
+            listPreference.setSummary(getPreferredNetworkModeSummaryResId(settingsMode));
            return true;
        }