| commit | c3efb1d35c8752cef80011836facb76ab0c6e1e0 | [log] [tgz] |
|---|---|---|
| author | Chaohui Wang <chaohuiw@google.com> | Tue May 24 18:00:34 2022 +0800 |
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | Wed May 25 03:43:02 2022 +0000 |
| tree | ba9b8cde26926a2d4f7d0ec9dd63404152422ed8 | |
| parent | 04ecc1d1ce0933378ad1f7031c7630f17fb2aad1 [diff] |
Fix crash for DefaultSubscriptionController setSummaryProvider() is used instead of setSummary() in Ia24d88817c99db7ed3fc264dbc9c10e0a09d8a39, but there is still a place using the setSummary(), mixing these two will lead to crash. Change it to setSummaryProvider() to prevent crash. Fix: 233295254 Fix: 233712251 Test: manual Change-Id: I4627545711b848009c3bd7179f0368ff82e62697 (cherry picked from commit 2e34038233a99cefbf432d2b68851048246dfecb) Merged-In: I4627545711b848009c3bd7179f0368ff82e62697
diff --git a/src/com/android/settings/network/telephony/DefaultSubscriptionController.java b/src/com/android/settings/network/telephony/DefaultSubscriptionController.java index 5511829..a3a281c 100644 --- a/src/com/android/settings/network/telephony/DefaultSubscriptionController.java +++ b/src/com/android/settings/network/telephony/DefaultSubscriptionController.java
@@ -168,8 +168,8 @@ 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; }