c5029c9007f7f3501c9d11924e1c48f49fd8161d - platform/frameworks/base

commit	c5029c9007f7f3501c9d11924e1c48f49fd8161d	[log] [tgz]
author	Malcolm Chen <refuhoo@google.com>	Tue Aug 13 13:24:07 2019 -0700
committer	Xiangyu/Malcolm Chen <refuhoo@google.com>	Tue Mar 17 19:29:12 2020 +0000
tree	fa1c13cdc3e28310bea6843eb3095d053a65ba49
parent	d274ec885903ff2effd069a87601799d5b618c6b [diff]

Move filterMobileSubscriptionInSameGroup into KeyguardUpdateMonitor.

This avoids race condition that, KeyguardUpdateMonitor refreshes active
sub list however CarrierTextController filtered it based on stale active
data subId.

By move filterMobileSubscriptionInSameGroup into KeyguardUpdateMonitor,
it becomes the single source of truth about which carrier name should be
shown.

Bug: 138456731
Bug: 151600673
Test: manual and unittest
Change-Id: Ida3a90c5408b056cad7a79fbba84fe880ce1e5be
Merged-In: Ida3a90c5408b056cad7a79fbba84fe880ce1e5be
(cherry picked from commit 5c63b51d9e9e6c2b90575b71e62e66f39c9ff719)

packages/SystemUI/src/com/android/keyguard/CarrierTextController.java[diff]
packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java[diff]
packages/SystemUI/src/com/android/systemui/statusbar/OperatorNameView.java[diff]
packages/SystemUI/src/com/android/systemui/statusbar/policy/EmergencyCryptkeeperText.java[diff]
packages/SystemUI/tests/src/com/android/keyguard/CarrierTextControllerTest.java[diff]
packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java[diff]

6 files changed