Fixes for CBRS
* Make sure that KeyguardUpdateMonitor returns the complete list of
subscription info, so classes like CarrierTextController can filter it
(in the same way as NetworkControllerImpl).
* MobileSignalController state should identify a sim as data if it's the
active data sub, not the default.
Fixes: 135553848
Test: manual, CBRS set active data to be different than default and
observe QS Tile
Test: manual, CBRS set preferred data to be different than visible sub
and observe QS header signal icon and carrier info.
Change-Id: I4b348a951e65542b24d263760983c6a6d31dfa6d
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerBaseTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerBaseTest.java
index 3464fe5..9ae9ceb 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerBaseTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerBaseTest.java
@@ -181,6 +181,7 @@
protected void setDefaultSubId(int subId) {
when(mMockSubDefaults.getDefaultDataSubId()).thenReturn(subId);
when(mMockSubDefaults.getDefaultVoiceSubId()).thenReturn(subId);
+ when(mMockSubDefaults.getActiveDataSubId()).thenReturn(subId);
}
protected void setSubscriptions(int... subIds) {