PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "eSIM with same group UUID" into rvc-qpr-dev am: 0968b8603e

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13241064

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I104ea3e6ace5e0d3fbe80d62e835d2fa986b852b
This commit is contained in:
Bonian Chen
2020-12-17 15:52:05 +00:00
committed by Automerger Merge Worker
parent 4ea9c2d6a5 0968b8603e
commit bb5688ea22
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/network/SubscriptionsPreferenceController.java
View File

@@ -170,7 +170,7 @@ public class SubscriptionsPreferenceController extends AbstractPreferenceControl
// Avoid from showing subscription(SIM)s which has been marked as hidden // Avoid from showing subscription(SIM)s which has been marked as hidden
// For example, only one subscription will be shown when there're multiple // For example, only one subscription will be shown when there're multiple
// subscriptions with same group UUID. // subscriptions with same group UUID.
if (!isSubscriptionCanBeDisplayed(mContext, subId)) { if (!canSubscriptionBeDisplayed(mContext, subId)) {
continue; continue;
} }
activeSubIds.add(subId); activeSubIds.add(subId);
@@ -308,7 +308,7 @@ public class SubscriptionsPreferenceController extends AbstractPreferenceControl
// For example, only one subscription will be shown when there're multiple // For example, only one subscription will be shown when there're multiple
// subscriptions with same group UUID. // subscriptions with same group UUID.
.filter(subInfo -> .filter(subInfo ->
isSubscriptionCanBeDisplayed(mContext, subInfo.getSubscriptionId())) canSubscriptionBeDisplayed(mContext, subInfo.getSubscriptionId()))
.count() >= 2; .count() >= 2;
} }
@@ -349,7 +349,7 @@ public class SubscriptionsPreferenceController extends AbstractPreferenceControl
} }
@VisibleForTesting @VisibleForTesting
boolean isSubscriptionCanBeDisplayed(Context context, int subId) { boolean canSubscriptionBeDisplayed(Context context, int subId) {
return (SubscriptionUtil.getAvailableSubscription(context, return (SubscriptionUtil.getAvailableSubscription(context,
ProxySubscriptionManager.getInstance(context), subId) != null); ProxySubscriptionManager.getInstance(context), subId) != null);
} }

4
tests/robotests/src/com/android/settings/network/SubscriptionsPreferenceControllerTest.java
View File

@@ -122,7 +122,7 @@ public class SubscriptionsPreferenceControllerTest {
mController = spy( mController = spy(
new SubscriptionsPreferenceController(mContext, mLifecycle, mUpdateListener, new SubscriptionsPreferenceController(mContext, mLifecycle, mUpdateListener,
KEY, 5)); KEY, 5));
doReturn(true).when(mController).isSubscriptionCanBeDisplayed(any(), anyInt()); doReturn(true).when(mController).canSubscriptionBeDisplayed(any(), anyInt());
doReturn(mSignalStrengthIcon).when(mController).getIcon(anyInt(), anyInt(), anyBoolean()); doReturn(mSignalStrengthIcon).when(mController).getIcon(anyInt(), anyInt(), anyBoolean());
} }
@@ -458,7 +458,7 @@ public class SubscriptionsPreferenceControllerTest {
@Test @Test
public void displayPreference_subscriptionsWithSameGroupUUID_onlyOneWillBeSeen() { public void displayPreference_subscriptionsWithSameGroupUUID_onlyOneWillBeSeen() {
doReturn(false).when(mController).isSubscriptionCanBeDisplayed(any(), eq(3)); doReturn(false).when(mController).canSubscriptionBeDisplayed(any(), eq(3));
final List<SubscriptionInfo> subs = setupMockSubscriptions(3); final List<SubscriptionInfo> subs = setupMockSubscriptions(3);
SubscriptionUtil.setActiveSubscriptionsForTesting(subs.subList(0, 3)); SubscriptionUtil.setActiveSubscriptionsForTesting(subs.subList(0, 3));