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

Add default calls/SMS subscription prefs to mobile details page

Browse Source 
This adds prefs to the the details page for mobile network subscriptions
that appear in multi-SIM mode. They show which subscription is set as
the default for calls and SMS respectively, and let the user change what
the default is for each. They can be set to either a specific
subscription, or set to "Ask every time".

Bug: 122670283
Test: make RunSettingsRoboTests
Change-Id: Id2b23e4b5c3d1b5c04b5766e73fc8202c05d8f75
This commit is contained in:
Antony Sargent
2019-01-22 10:57:25 -08:00
parent def4fd900d
commit ff484e11e9
9 changed files with 590 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

289
tests/robotests/src/com/android/settings/network/telephony/DefaultSubscriptionControllerTest.java Normal file
View File

@@ -0,0 +1,289 @@
/*
* Copyright (C) 2019 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.network.telephony;
import static com.android.settings.core.BasePreferenceController.AVAILABLE;
import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.content.Context;
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
import com.android.settings.R;
import com.android.settings.network.SubscriptionUtil;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
import java.util.Arrays;
import androidx.preference.ListPreference;
import androidx.preference.PreferenceScreen;
@RunWith(RobolectricTestRunner.class)
public class DefaultSubscriptionControllerTest {
@Mock
private SubscriptionManager mManager;
@Mock
private PreferenceScreen mScreen;
private ListPreference mListPreference;
private Context mContext;
private DefaultSubscriptionController mController;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = spy(RuntimeEnvironment.application);
when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mManager);
final String key = "prefkey";
mController = spy(new TestDefaultSubscriptionController(mContext, key));
mListPreference = spy(new ListPreference(mContext));
when(mScreen.findPreference(key)).thenReturn(mListPreference);
}
@After
public void tearDown() {
SubscriptionUtil.setAvailableSubscriptionsForTesting(null);
}
@Test
public void getAvailabilityStatus_onlyOneSubscription_notAvailable() {
SubscriptionUtil.setAvailableSubscriptionsForTesting(Arrays.asList(
createMockSub(1, "sub1")));
assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
}
@Test
public void getAvailabilityStatus_twoSubscriptions_isAvailable() {
SubscriptionUtil.setAvailableSubscriptionsForTesting(Arrays.asList(
createMockSub(1, "sub1"),
createMockSub(2, "sub2")));
assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
}
@Test
public void displayPreference_twoSubscriptionsSub1Default_correctListPreferenceValues() {
final SubscriptionInfo sub1 = createMockSub(111, "sub1");
final SubscriptionInfo sub2 = createMockSub(222, "sub2");
SubscriptionUtil.setAvailableSubscriptionsForTesting(Arrays.asList(sub1, sub2));
doReturn(sub1.getSubscriptionId()).when(mController).getDefaultSubscriptionId();
mController.displayPreference(mScreen);
final CharSequence entry = mListPreference.getEntry();
final String value = mListPreference.getValue();
assertThat(entry).isEqualTo("sub1");
assertThat(value).isEqualTo("111");
final CharSequence[] entries = mListPreference.getEntries();
assertThat(entries.length).isEqualTo(3);
assertThat(entries[0]).isEqualTo("sub1");
assertThat(entries[1]).isEqualTo("sub2");
assertThat(entries[2]).isEqualTo(mContext.getString(R.string.calls_and_sms_ask_every_time));
final CharSequence[] entryValues = mListPreference.getEntryValues();
assertThat(entryValues.length).isEqualTo(3);
assertThat(entryValues[0]).isEqualTo("111");
assertThat(entryValues[1]).isEqualTo("222");
assertThat(entryValues[2]).isEqualTo(
Integer.toString(SubscriptionManager.INVALID_SUBSCRIPTION_ID));
}
@Test
public void displayPreference_twoSubscriptionsSub2Default_correctListPreferenceValues() {
final SubscriptionInfo sub1 = createMockSub(111, "sub1");
final SubscriptionInfo sub2 = createMockSub(222, "sub2");
SubscriptionUtil.setAvailableSubscriptionsForTesting(Arrays.asList(sub1, sub2));
doReturn(sub2.getSubscriptionId()).when(mController).getDefaultSubscriptionId();
mController.displayPreference(mScreen);
final CharSequence entry = mListPreference.getEntry();
final String value = mListPreference.getValue();
assertThat(entry).isEqualTo("sub2");
assertThat(value).isEqualTo("222");
final CharSequence[] entries = mListPreference.getEntries();
assertThat(entries.length).isEqualTo(3);
assertThat(entries[0]).isEqualTo("sub1");
assertThat(entries[1]).isEqualTo("sub2");
assertThat(entries[2]).isEqualTo(mContext.getString(R.string.calls_and_sms_ask_every_time));
final CharSequence[] entryValues = mListPreference.getEntryValues();
assertThat(entryValues.length).isEqualTo(3);
assertThat(entryValues[0]).isEqualTo("111");
assertThat(entryValues[1]).isEqualTo("222");
assertThat(entryValues[2]).isEqualTo(
Integer.toString(SubscriptionManager.INVALID_SUBSCRIPTION_ID));
}
@Test
public void onPreferenceChange_prefChangedToSub2_callbackCalledCorrectly() {
final SubscriptionInfo sub1 = createMockSub(111, "sub1");
final SubscriptionInfo sub2 = createMockSub(222, "sub2");
SubscriptionUtil.setAvailableSubscriptionsForTesting(Arrays.asList(sub1, sub2));
doReturn(sub1.getSubscriptionId()).when(mController).getDefaultSubscriptionId();
mController.displayPreference(mScreen);
mListPreference.setValue("222");
mController.onPreferenceChange(mListPreference, "222");
verify(mController).setDefaultSubscription(eq(222));
}
@Test
public void onPreferenceChange_prefChangedToAlwaysAsk_callbackCalledCorrectly() {
final SubscriptionInfo sub1 = createMockSub(111, "sub1");
final SubscriptionInfo sub2 = createMockSub(222, "sub2");
SubscriptionUtil.setAvailableSubscriptionsForTesting(Arrays.asList(sub1, sub2));
doReturn(sub1.getSubscriptionId()).when(mController).getDefaultSubscriptionId();
mController.displayPreference(mScreen);
mListPreference.setValue(Integer.toString(SubscriptionManager.INVALID_SUBSCRIPTION_ID));
mController.onPreferenceChange(mListPreference,
Integer.toString(SubscriptionManager.INVALID_SUBSCRIPTION_ID));
verify(mController).setDefaultSubscription(
eq(SubscriptionManager.INVALID_SUBSCRIPTION_ID));
}
@Test
public void onSubscriptionsChanged_twoSubscriptionsDefaultChanges_selectedEntryGetsUpdated() {
final SubscriptionInfo sub1 = createMockSub(111, "sub1");
final SubscriptionInfo sub2 = createMockSub(222, "sub2");
SubscriptionUtil.setAvailableSubscriptionsForTesting(Arrays.asList(sub1, sub2));
doReturn(sub1.getSubscriptionId()).when(mController).getDefaultSubscriptionId();
mController.displayPreference(mScreen);
assertThat( mListPreference.getEntry()).isEqualTo("sub1");
assertThat(mListPreference.getValue()).isEqualTo("111");
doReturn(sub2.getSubscriptionId()).when(mController).getDefaultSubscriptionId();
mController.onSubscriptionsChanged();
assertThat( mListPreference.getEntry()).isEqualTo("sub2");
assertThat(mListPreference.getValue()).isEqualTo("222");
}
@Test
public void onSubscriptionsChanged_goFromTwoSubscriptionsToOne_prefDisappears() {
final SubscriptionInfo sub1 = createMockSub(111, "sub1");
final SubscriptionInfo sub2 = createMockSub(222, "sub2");
SubscriptionUtil.setAvailableSubscriptionsForTesting(Arrays.asList(sub1, sub2));
doReturn(sub1.getSubscriptionId()).when(mController).getDefaultSubscriptionId();
mController.displayPreference(mScreen);
assertThat(mController.isAvailable()).isTrue();
assertThat(mListPreference.isVisible()).isTrue();
SubscriptionUtil.setAvailableSubscriptionsForTesting(Arrays.asList(sub1));
mController.onSubscriptionsChanged();
assertThat(mController.isAvailable()).isFalse();
assertThat(mListPreference.isVisible()).isFalse();
}
@Test
public void onSubscriptionsChanged_goFromOneSubscriptionToTwo_prefAppears() {
final SubscriptionInfo sub1 = createMockSub(111, "sub1");
final SubscriptionInfo sub2 = createMockSub(222, "sub2");
SubscriptionUtil.setAvailableSubscriptionsForTesting(Arrays.asList(sub1));
doReturn(sub1.getSubscriptionId()).when(mController).getDefaultSubscriptionId();
mController.displayPreference(mScreen);
assertThat(mController.isAvailable()).isFalse();
assertThat(mListPreference.isVisible()).isFalse();
SubscriptionUtil.setAvailableSubscriptionsForTesting(Arrays.asList(sub1, sub2));
mController.onSubscriptionsChanged();
assertThat(mController.isAvailable()).isTrue();
assertThat(mListPreference.isVisible()).isTrue();
}
@Test
public void onSubscriptionsChanged_goFromTwoToThreeSubscriptions_listGetsUpdated() {
final SubscriptionInfo sub1 = createMockSub(111, "sub1");
final SubscriptionInfo sub2 = createMockSub(222, "sub2");
final SubscriptionInfo sub3 = createMockSub(333, "sub3");
SubscriptionUtil.setAvailableSubscriptionsForTesting(Arrays.asList(sub1, sub2));
doReturn(sub1.getSubscriptionId()).when(mController).getDefaultSubscriptionId();
mController.displayPreference(mScreen);
assertThat(mListPreference.getEntries().length).isEqualTo(3);
SubscriptionUtil.setAvailableSubscriptionsForTesting(Arrays.asList(sub1, sub2, sub3));
mController.onSubscriptionsChanged();
assertThat(mController.isAvailable()).isTrue();
assertThat(mListPreference.isVisible()).isTrue();
final CharSequence[] entries = mListPreference.getEntries();
final CharSequence[] entryValues = mListPreference.getEntryValues();
assertThat(entries.length).isEqualTo(4);
assertThat(entries[0].toString()).isEqualTo("sub1");
assertThat(entries[1].toString()).isEqualTo("sub2");
assertThat(entries[2].toString()).isEqualTo("sub3");
assertThat(entries[3].toString()).isEqualTo(
mContext.getString(R.string.calls_and_sms_ask_every_time));
assertThat(entryValues[0].toString()).isEqualTo("111");
assertThat(entryValues[1].toString()).isEqualTo("222");
assertThat(entryValues[2].toString()).isEqualTo("333");
assertThat(entryValues[3].toString()).isEqualTo(
Integer.toString(SubscriptionManager.INVALID_SUBSCRIPTION_ID));
}
private SubscriptionInfo createMockSub(int id, String displayName) {
final SubscriptionInfo sub = mock(SubscriptionInfo.class);
when(sub.getSubscriptionId()).thenReturn(id);
when(sub.getDisplayName()).thenReturn(displayName);
return sub;
}
private class TestDefaultSubscriptionController extends DefaultSubscriptionController {
public TestDefaultSubscriptionController(Context context, String preferenceKey) {
super(context, preferenceKey);
}
@Override
protected SubscriptionInfo getDefaultSubscriptionInfo() {
return null;
}
@Override
protected int getDefaultSubscriptionId() {
return 0;
}
@Override
protected void setDefaultSubscription(int subscriptionId) {
}
}
}

8
tests/robotests/src/com/android/settings/network/telephony/MobileNetworkSettingsTest.java
View File

@@ -85,7 +85,13 @@ public class MobileNetworkSettingsTest {
}
@Test
public void onAttach_noCrash() {
public void onAttach_noV2Flag_noCrash() {
mFragment.onAttach(mContext);
}
@Test
public void onAttach_v2Flag_noCrash() {
FeatureFlagPersistent.setEnabled(mContext, FeatureFlags.NETWORK_INTERNET_V2, true);
mFragment.onAttach(mContext);
}