Unique display name util uses available, rather than active, subscriptions.
Test: atest -c SettingsUnitTest
Bug: 178560175
Change-Id: Ief035cf3de3ac03fe348095f36bfb78a41f93d2c
(cherry picked from commit c14e3b3115
)
Merged-In: Ief035cf3de3ac03fe348095f36bfb78a41f93d2c
This commit is contained in:
@@ -182,8 +182,9 @@ public class ProviderModelSlice extends WifiSlice {
|
||||
}
|
||||
final int defaultSubId = subscriptionManager.getDefaultDataSubscriptionId();
|
||||
log("defaultSubId:" + defaultSubId);
|
||||
if (!SubscriptionManager.isUsableSubscriptionId(defaultSubId)) {
|
||||
return; // No subscription - do nothing.
|
||||
|
||||
if (!defaultSubscriptionIsUsable(defaultSubId)) {
|
||||
return;
|
||||
}
|
||||
|
||||
boolean isToggleAction = intent.hasExtra(EXTRA_TOGGLE_STATE);
|
||||
@@ -258,4 +259,12 @@ public class ProviderModelSlice extends WifiSlice {
|
||||
.setTitle(mContext.getText(R.string.ethernet))
|
||||
.setSubtitle(mContext.getText(R.string.cannot_switch_networks_while_connected));
|
||||
}
|
||||
|
||||
/**
|
||||
* Wrap the subscriptionManager call for test mocking.
|
||||
*/
|
||||
@VisibleForTesting
|
||||
protected boolean defaultSubscriptionIsUsable(int defaultSubId) {
|
||||
return SubscriptionManager.isUsableSubscriptionId(defaultSubId);
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user