Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't show signal bar of hidden Cellular subscription."

Browse Source
This commit is contained in:
Xiangyu/Malcolm Chen
2019-01-24 01:45:07 +00:00
committed by Gerrit Code Review
parent a53fc20213 907005d1bb
commit 2f2a4199fc
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java
View File

@@ -527,7 +527,8 @@ public class NetworkControllerImpl extends BroadcastReceiver
@VisibleForTesting @VisibleForTesting
void doUpdateMobileControllers() { void doUpdateMobileControllers() {
List<SubscriptionInfo> subscriptions = mSubscriptionManager.getActiveSubscriptionInfoList(); List<SubscriptionInfo> subscriptions = mSubscriptionManager
.getActiveSubscriptionInfoList(true);
if (subscriptions == null) { if (subscriptions == null) {
subscriptions = Collections.emptyList(); subscriptions = Collections.emptyList();
} }

1
packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerBaseTest.java
View File

@@ -182,6 +182,7 @@ public class NetworkControllerBaseTest extends SysuiTestCase {
subs.add(subscription); subs.add(subscription);
} }
when(mMockSm.getActiveSubscriptionInfoList()).thenReturn(subs); when(mMockSm.getActiveSubscriptionInfoList()).thenReturn(subs);
when(mMockSm.getActiveSubscriptionInfoList(anyBoolean())).thenReturn(subs);
mNetworkController.doUpdateMobileControllers(); mNetworkController.doUpdateMobileControllers();
} }