Merge cherrypicks of [18573290] into tm-release.

Change-Id: I61cbdb2aa6c1447b483e86b7405fa091636e1522
2022-05-24 18:39:07 +00:00
parent d623a62539 2953db1d2c
commit 220b940407
1 changed files with 2 additions and 2 deletions
--- a/src/com/android/settings/network/telephony/DefaultSubscriptionController.java
+++ b/src/com/android/settings/network/telephony/DefaultSubscriptionController.java
@@ -168,8 +168,8 @@ public abstract class DefaultSubscriptionController extends TelephonyBasePrefere

        if (subs.size() == 1) {
            mPreference.setEnabled(false);
-            mPreference.setSummary(SubscriptionUtil.getUniqueSubscriptionDisplayName(
-                    subs.get(0), mContext));
+            mPreference.setSummaryProvider(pref ->
+                    SubscriptionUtil.getUniqueSubscriptionDisplayName(subs.get(0), mContext));
            return;
        }