From 907005d1bbae39647731d1ea9ea71de802088a46 Mon Sep 17 00:00:00 2001 From: Malcolm Chen Date: Fri, 21 Dec 2018 17:11:10 -0800 Subject: Don't show signal bar of hidden Cellular subscription. Bug: 121396526 Test: manual Change-Id: I646278c9ab4dd2f37083658a25ad38ad4f65d42f Merged-In: I646278c9ab4dd2f37083658a25ad38ad4f65d42f --- .../com/android/systemui/statusbar/policy/NetworkControllerImpl.java | 3 ++- .../android/systemui/statusbar/policy/NetworkControllerBaseTest.java | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) 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 330ee8f9ab81..326147df184d 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 @@ public class NetworkControllerImpl extends BroadcastReceiver @VisibleForTesting void doUpdateMobileControllers() { - List subscriptions = mSubscriptionManager.getActiveSubscriptionInfoList(); + List 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 35f0dba12cb9..55b4d27ff354 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 @@ public class NetworkControllerBaseTest extends SysuiTestCase { subs.add(subscription); } when(mMockSm.getActiveSubscriptionInfoList()).thenReturn(subs); + when(mMockSm.getActiveSubscriptionInfoList(anyBoolean())).thenReturn(subs); mNetworkController.doUpdateMobileControllers(); } -- cgit v1.2.3-59-g8ed1b