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

[Provider Model] Should show "No SIM" if there is no SIM in the device.

Browse Source 
Bug: 172053880
Test: atest NetworkProviderCallsSmsControllerTest#getSummary_noSim_returnNoSim
Change-Id: I31fd8b4b6928ef8aa7c45ac7651fa26e0b08446e
This commit is contained in:
Zoey Chen
2020-12-08 17:35:10 +08:00
parent 5f4826dec0
commit 44559badaf
3 changed files with 43 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
res/values/strings.xml
View File

@@ -12495,6 +12495,16 @@
<string name="calls_preference_title">Calls</string>
<!-- Provider Model: SMS preference title -->
<string name="sms_preference_title">SMS</string>
<!-- Provider Model: Preferred status in summary for Calls & SMS -->
<string name="calls_sms_preferred">preferred</string>
<!-- Provider Model: Calls Preferred status in summary for Calls & SMS -->
<string name="calls_sms_calls_preferred">calls preferred</string>
<!-- Provider Model: SMS Preferred status in summary for Calls & SMS -->
<string name="calls_sms_sms_preferred">SMS preferred</string>
<!-- Provider Model: Unavailable status in summary for Calls & SMS -->
<string name="calls_sms_unavailable">unavailable</string>
<!-- Provider Model: No SIM status in summary for Calls & SMS -->
<string name="calls_sms_no_sim">No SIM</string>
<!-- Network & internet preferences title [CHAR LIMIT=NONE] -->
<string name="network_and_internet_preferences_title">Preferences</string>
<!-- Network & internet preferences summary [CHAR LIMIT=NONE] -->

20
src/com/android/settings/network/NetworkProviderCallsSmsController.java
View File

@@ -22,7 +22,6 @@ import android.content.Context;
import android.os.UserManager;
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
import android.util.Log;
import androidx.annotation.VisibleForTesting;
import androidx.lifecycle.LifecycleObserver;
@@ -42,10 +41,6 @@ public class NetworkProviderCallsSmsController extends AbstractPreferenceControl
private static final String TAG = "NetworkProviderCallsSmsController";
private static final String KEY = "calls_and_sms";
private static final String PREFERRED_CALL_SMS = "preferred";
private static final String PREFERRED_CALL = "calls preferred";
private static final String PREFERRED_SMS = "SMS preferred";
private static final String UNAVAILABLE = "unavailable";
private UserManager mUserManager;
private SubscriptionManager mSubscriptionManager;
@@ -91,7 +86,7 @@ public class NetworkProviderCallsSmsController extends AbstractPreferenceControl
mSubscriptionManager);
if (subs.isEmpty()) {
return null;
return setSummaryResId(R.string.calls_sms_no_sim);
} else {
final StringBuilder summary = new StringBuilder();
for (SubscriptionInfo subInfo : subs) {
@@ -131,19 +126,23 @@ public class NetworkProviderCallsSmsController extends AbstractPreferenceControl
boolean isSmsPreferred = subId == getDefaultSmsSubscriptionId();
if (!SubscriptionManager.isValidSubscriptionId(subId)) {
status = UNAVAILABLE;
status = setSummaryResId(R.string.calls_sms_unavailable);
} else {
if (isDataPreferred && isSmsPreferred) {
status = PREFERRED_CALL_SMS;
status = setSummaryResId(R.string.calls_sms_preferred);
} else if (isDataPreferred) {
status = PREFERRED_CALL;
status = setSummaryResId(R.string.calls_sms_calls_preferred);
} else if (isSmsPreferred) {
status = PREFERRED_SMS;
status = setSummaryResId(R.string.calls_sms_sms_preferred);
}
}
return status;
}
private String setSummaryResId(int resId) {
return mContext.getResources().getString(resId);
}
@VisibleForTesting
protected int getDefaultVoiceSubscriptionId(){
return SubscriptionManager.getDefaultVoiceSubscriptionId();
@@ -167,6 +166,7 @@ public class NetworkProviderCallsSmsController extends AbstractPreferenceControl
if (subs.isEmpty()) {
mPreference.setEnabled(false);
} else {
mPreference.setEnabled(true);
mPreference.setFragment(NetworkProviderCallsSmsFragment.class.getCanonicalName());
}
}

34
tests/unit/src/com/android/settings/network/NetworkProviderCallsSmsControllerTest.java
View File

@@ -27,6 +27,7 @@ import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
import android.text.TextUtils;
import com.android.settings.testutils.ResourcesUtils;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.RestrictedPreference;
@@ -46,6 +47,7 @@ import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import java.util.ArrayList;
import java.util.Arrays;
import static org.mockito.Mockito.doReturn;
@@ -60,10 +62,6 @@ public class NetworkProviderCallsSmsControllerTest {
private static final String KEY_PREFERENCE_CALLS_SMS = "calls_and_sms";
private static final String DISPLAY_NAME_1 = "Sub 1";
private static final String DISPLAY_NAME_2 = "Sub 2";
private static final String PREFERRED_CALL_SMS = "preferred";
private static final String PREFERRED_CALL = "calls preferred";
private static final String PREFERRED_SMS = "SMS preferred";
private static final String UNAVAILABLE = "unavailable";
@Mock
private SubscriptionManager mSubscriptionManager;
@@ -150,6 +148,20 @@ public class NetworkProviderCallsSmsControllerTest {
when(subscriptionInfo.getDisplayName()).thenReturn(displayName);
}
private String setSummaryResId(String resName) {
return ResourcesUtils.getResourcesString(mContext, resName);
}
@Test
@UiThreadTest
public void getSummary_noSim_returnNoSim() {
when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn(new ArrayList<>());
displayPreferenceWithLifecycle();
assertTrue(TextUtils.equals(mController.getSummary(),
setSummaryResId("calls_sms_no_sim")));
}
@Test
@UiThreadTest
public void getSummary_invalidSubId_returnUnavailable() {
@@ -162,7 +174,7 @@ public class NetworkProviderCallsSmsControllerTest {
final StringBuilder summary = new StringBuilder();
summary.append(DISPLAY_NAME_1)
.append(" (")
.append(UNAVAILABLE)
.append(setSummaryResId("calls_sms_unavailable"))
.append(")");
assertTrue(TextUtils.equals(mController.getSummary(), summary));
@@ -181,7 +193,7 @@ public class NetworkProviderCallsSmsControllerTest {
final StringBuilder summary = new StringBuilder();
summary.append(DISPLAY_NAME_1)
.append(" (")
.append(UNAVAILABLE)
.append(setSummaryResId("calls_sms_unavailable"))
.append(")")
.append(", ")
.append(DISPLAY_NAME_2);
@@ -233,12 +245,12 @@ public class NetworkProviderCallsSmsControllerTest {
final StringBuilder summary = new StringBuilder();
summary.append(DISPLAY_NAME_1)
.append(" (")
.append(PREFERRED_CALL)
.append(setSummaryResId("calls_sms_calls_preferred"))
.append(")")
.append(", ")
.append(DISPLAY_NAME_2)
.append(" (")
.append(PREFERRED_SMS)
.append(setSummaryResId("calls_sms_sms_preferred"))
.append(")");
assertTrue(TextUtils.equals(mController.getSummary(), summary));
@@ -260,12 +272,12 @@ public class NetworkProviderCallsSmsControllerTest {
final StringBuilder summary = new StringBuilder();
summary.append(DISPLAY_NAME_1)
.append(" (")
.append(PREFERRED_SMS)
.append(setSummaryResId("calls_sms_sms_preferred"))
.append(")")
.append(", ")
.append(DISPLAY_NAME_2)
.append(" (")
.append(PREFERRED_CALL)
.append(setSummaryResId("calls_sms_calls_preferred"))
.append(")");
assertTrue(TextUtils.equals(mController.getSummary(), summary));
@@ -287,7 +299,7 @@ public class NetworkProviderCallsSmsControllerTest {
final StringBuilder summary = new StringBuilder();
summary.append(DISPLAY_NAME_1)
.append(" (")
.append(PREFERRED_CALL_SMS)
.append(setSummaryResId("calls_sms_preferred"))
.append(")")
.append(", ")
.append(DISPLAY_NAME_2);