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

1 files changed, 5 insertions, 0 deletions

diff --git a/packages/SystemUI/src/com/android/keyguard/CarrierTextController.java b/packages/SystemUI/src/com/android/keyguard/CarrierTextController.java
index 209074812d7a..11d093f22840 100644
--- a/packages/SystemUI/src/com/android/keyguard/CarrierTextController.java
+++ b/packages/SystemUI/src/com/android/keyguard/CarrierTextController.java
@@ -303,6 +303,11 @@ public class CarrierTextController {
             }
         } else {
             subs = mKeyguardUpdateMonitor.getSubscriptionInfo(false);
+            if (subs == null) {
+                subs = new ArrayList<>();
+            } else {
+                filterMobileSubscriptionInSameGroup(subs);
+            }
         }
         return subs;
     }