| commit | d5211044645682c1907daadacd52bfbc7523f395 | [log] [tgz] |
|---|---|---|
| author | Xiangyu/Malcolm Chen <refuhoo@google.com> | Wed Jan 23 18:15:38 2019 -0800 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jan 23 18:15:38 2019 -0800 |
| tree | 036e8bc98112d799e9d903ec940adbd06cc62ab2 | |
| parent | 62a23085508570f6bacbcccd165ac06e2ba8e534 [diff] | |
| parent | 2f2a4199fc03d2b9e35a67280586e270bc72a5e8 [diff] |
Merge "Don't show signal bar of hidden Cellular subscription." am: 2f2a4199fc Change-Id: I3fa6a5b7baec94bd085a86fb4cce5062c5fd1a0f
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java index 330ee8f..326147d 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java
@@ -527,7 +527,8 @@ @VisibleForTesting void doUpdateMobileControllers() { - List<SubscriptionInfo> subscriptions = mSubscriptionManager.getActiveSubscriptionInfoList(); + List<SubscriptionInfo> subscriptions = mSubscriptionManager + .getActiveSubscriptionInfoList(true); if (subscriptions == null) { subscriptions = Collections.emptyList(); }
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 35f0dba..55b4d27 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
@@ -182,6 +182,7 @@ subs.add(subscription); } when(mMockSm.getActiveSubscriptionInfoList()).thenReturn(subs); + when(mMockSm.getActiveSubscriptionInfoList(anyBoolean())).thenReturn(subs); mNetworkController.doUpdateMobileControllers(); }