Merge "When device has a call, avoid user inactive/active SIM." into udc-qpr-dev
This commit is contained in:
@@ -16,12 +16,16 @@
|
|||||||
|
|
||||||
package com.android.settings.network.telephony;
|
package com.android.settings.network.telephony;
|
||||||
|
|
||||||
|
import static android.telephony.TelephonyManager.CALL_STATE_IDLE;
|
||||||
|
|
||||||
import static androidx.lifecycle.Lifecycle.Event.ON_PAUSE;
|
import static androidx.lifecycle.Lifecycle.Event.ON_PAUSE;
|
||||||
import static androidx.lifecycle.Lifecycle.Event.ON_RESUME;
|
import static androidx.lifecycle.Lifecycle.Event.ON_RESUME;
|
||||||
|
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.telephony.SubscriptionInfo;
|
import android.telephony.SubscriptionInfo;
|
||||||
import android.telephony.SubscriptionManager;
|
import android.telephony.SubscriptionManager;
|
||||||
|
import android.telephony.TelephonyCallback;
|
||||||
|
import android.telephony.TelephonyManager;
|
||||||
|
|
||||||
import androidx.lifecycle.LifecycleObserver;
|
import androidx.lifecycle.LifecycleObserver;
|
||||||
import androidx.lifecycle.OnLifecycleEvent;
|
import androidx.lifecycle.OnLifecycleEvent;
|
||||||
@@ -40,26 +44,40 @@ public class MobileNetworkSwitchController extends BasePreferenceController impl
|
|||||||
private int mSubId;
|
private int mSubId;
|
||||||
private SubscriptionsChangeListener mChangeListener;
|
private SubscriptionsChangeListener mChangeListener;
|
||||||
private SubscriptionManager mSubscriptionManager;
|
private SubscriptionManager mSubscriptionManager;
|
||||||
|
private TelephonyManager mTelephonyManager;
|
||||||
|
private CallStateTelephonyCallback mCallStateCallback;
|
||||||
|
|
||||||
public MobileNetworkSwitchController(Context context, String preferenceKey) {
|
public MobileNetworkSwitchController(Context context, String preferenceKey) {
|
||||||
super(context, preferenceKey);
|
super(context, preferenceKey);
|
||||||
mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
|
mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
|
||||||
mSubscriptionManager = mContext.getSystemService(SubscriptionManager.class);
|
mSubscriptionManager = mContext.getSystemService(SubscriptionManager.class);
|
||||||
|
mTelephonyManager = mContext.getSystemService(TelephonyManager.class);
|
||||||
mChangeListener = new SubscriptionsChangeListener(context, this);
|
mChangeListener = new SubscriptionsChangeListener(context, this);
|
||||||
}
|
}
|
||||||
|
|
||||||
void init(int subId) {
|
void init(int subId) {
|
||||||
mSubId = subId;
|
mSubId = subId;
|
||||||
|
mTelephonyManager = mTelephonyManager.createForSubscriptionId(mSubId);
|
||||||
}
|
}
|
||||||
|
|
||||||
@OnLifecycleEvent(ON_RESUME)
|
@OnLifecycleEvent(ON_RESUME)
|
||||||
public void onResume() {
|
public void onResume() {
|
||||||
mChangeListener.start();
|
mChangeListener.start();
|
||||||
|
|
||||||
|
if (mCallStateCallback == null) {
|
||||||
|
mCallStateCallback = new CallStateTelephonyCallback();
|
||||||
|
mTelephonyManager.registerTelephonyCallback(
|
||||||
|
mContext.getMainExecutor(), mCallStateCallback);
|
||||||
|
}
|
||||||
update();
|
update();
|
||||||
}
|
}
|
||||||
|
|
||||||
@OnLifecycleEvent(ON_PAUSE)
|
@OnLifecycleEvent(ON_PAUSE)
|
||||||
public void onPause() {
|
public void onPause() {
|
||||||
|
if (mCallStateCallback != null) {
|
||||||
|
mTelephonyManager.unregisterTelephonyCallback(mCallStateCallback);
|
||||||
|
mCallStateCallback = null;
|
||||||
|
}
|
||||||
mChangeListener.stop();
|
mChangeListener.stop();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -118,4 +136,12 @@ public class MobileNetworkSwitchController extends BasePreferenceController impl
|
|||||||
public void onSubscriptionsChanged() {
|
public void onSubscriptionsChanged() {
|
||||||
update();
|
update();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private class CallStateTelephonyCallback extends TelephonyCallback implements
|
||||||
|
TelephonyCallback.CallStateListener {
|
||||||
|
@Override
|
||||||
|
public void onCallStateChanged(int state) {
|
||||||
|
mSwitchBar.setSwitchBarEnabled(state == CALL_STATE_IDLE);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@@ -35,6 +35,8 @@ import android.os.Bundle;
|
|||||||
import android.os.Looper;
|
import android.os.Looper;
|
||||||
import android.telephony.SubscriptionInfo;
|
import android.telephony.SubscriptionInfo;
|
||||||
import android.telephony.SubscriptionManager;
|
import android.telephony.SubscriptionManager;
|
||||||
|
import android.telephony.TelephonyCallback;
|
||||||
|
import android.telephony.TelephonyManager;
|
||||||
import android.view.LayoutInflater;
|
import android.view.LayoutInflater;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.widget.LinearLayout;
|
import android.widget.LinearLayout;
|
||||||
@@ -44,28 +46,32 @@ import androidx.preference.PreferenceScreen;
|
|||||||
import androidx.preference.PreferenceViewHolder;
|
import androidx.preference.PreferenceViewHolder;
|
||||||
import androidx.test.annotation.UiThreadTest;
|
import androidx.test.annotation.UiThreadTest;
|
||||||
import androidx.test.core.app.ApplicationProvider;
|
import androidx.test.core.app.ApplicationProvider;
|
||||||
import androidx.test.ext.junit.runners.AndroidJUnit4;
|
|
||||||
|
|
||||||
import com.android.settings.network.SubscriptionUtil;
|
import com.android.settings.network.SubscriptionUtil;
|
||||||
import com.android.settings.widget.SettingsMainSwitchPreference;
|
import com.android.settings.widget.SettingsMainSwitchPreference;
|
||||||
|
|
||||||
import org.junit.After;
|
import org.junit.After;
|
||||||
import org.junit.Before;
|
import org.junit.Before;
|
||||||
import org.junit.Ignore;
|
import org.junit.Rule;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
import org.junit.runner.RunWith;
|
|
||||||
import org.mockito.ArgumentCaptor;
|
import org.mockito.ArgumentCaptor;
|
||||||
import org.mockito.Mock;
|
import org.mockito.Mock;
|
||||||
import org.mockito.MockitoAnnotations;
|
import org.mockito.junit.MockitoJUnit;
|
||||||
|
import org.mockito.junit.MockitoRule;
|
||||||
|
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
|
import java.util.concurrent.Executor;
|
||||||
|
|
||||||
@RunWith(AndroidJUnit4.class)
|
|
||||||
public class MobileNetworkSwitchControllerTest {
|
public class MobileNetworkSwitchControllerTest {
|
||||||
|
@Rule
|
||||||
|
public final MockitoRule mMockitoRule = MockitoJUnit.rule();
|
||||||
|
|
||||||
@Mock
|
@Mock
|
||||||
private SubscriptionManager mSubscriptionManager;
|
private SubscriptionManager mSubscriptionManager;
|
||||||
@Mock
|
@Mock
|
||||||
private SubscriptionInfo mSubscription;
|
private SubscriptionInfo mSubscription;
|
||||||
|
@Mock
|
||||||
|
private TelephonyManager mTelephonyManager;
|
||||||
|
|
||||||
private PreferenceScreen mScreen;
|
private PreferenceScreen mScreen;
|
||||||
private PreferenceManager mPreferenceManager;
|
private PreferenceManager mPreferenceManager;
|
||||||
@@ -76,7 +82,9 @@ public class MobileNetworkSwitchControllerTest {
|
|||||||
|
|
||||||
@Before
|
@Before
|
||||||
public void setUp() {
|
public void setUp() {
|
||||||
MockitoAnnotations.initMocks(this);
|
if (Looper.myLooper() == null) {
|
||||||
|
Looper.prepare();
|
||||||
|
}
|
||||||
mContext = spy(ApplicationProvider.getApplicationContext());
|
mContext = spy(ApplicationProvider.getApplicationContext());
|
||||||
when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager);
|
when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager);
|
||||||
when(mSubscriptionManager.setSubscriptionEnabled(eq(mSubId), anyBoolean()))
|
when(mSubscriptionManager.setSubscriptionEnabled(eq(mSubId), anyBoolean()))
|
||||||
@@ -89,18 +97,19 @@ public class MobileNetworkSwitchControllerTest {
|
|||||||
when(sub2.getSubscriptionId()).thenReturn(456);
|
when(sub2.getSubscriptionId()).thenReturn(456);
|
||||||
SubscriptionUtil.setAvailableSubscriptionsForTesting(Arrays.asList(mSubscription, sub2));
|
SubscriptionUtil.setAvailableSubscriptionsForTesting(Arrays.asList(mSubscription, sub2));
|
||||||
|
|
||||||
|
when(mContext.getSystemService(TelephonyManager.class)).thenReturn(mTelephonyManager);
|
||||||
|
when(mTelephonyManager.createForSubscriptionId(mSubId))
|
||||||
|
.thenReturn(mTelephonyManager);
|
||||||
|
|
||||||
final String key = "prefKey";
|
final String key = "prefKey";
|
||||||
mController = new MobileNetworkSwitchController(mContext, key);
|
mController = new MobileNetworkSwitchController(mContext, key);
|
||||||
mController.init(mSubscription.getSubscriptionId());
|
mController.init(mSubscription.getSubscriptionId());
|
||||||
|
|
||||||
if (Looper.myLooper() == null) {
|
|
||||||
Looper.prepare();
|
|
||||||
}
|
|
||||||
|
|
||||||
mPreferenceManager = new PreferenceManager(mContext);
|
mPreferenceManager = new PreferenceManager(mContext);
|
||||||
mScreen = mPreferenceManager.createPreferenceScreen(mContext);
|
mScreen = mPreferenceManager.createPreferenceScreen(mContext);
|
||||||
mSwitchBar = new SettingsMainSwitchPreference(mContext);
|
mSwitchBar = new SettingsMainSwitchPreference(mContext);
|
||||||
mSwitchBar.setKey(key);
|
mSwitchBar.setKey(key);
|
||||||
|
mSwitchBar.setTitle("123");
|
||||||
mScreen.addPreference(mSwitchBar);
|
mScreen.addPreference(mSwitchBar);
|
||||||
|
|
||||||
final LayoutInflater inflater = LayoutInflater.from(mContext);
|
final LayoutInflater inflater = LayoutInflater.from(mContext);
|
||||||
@@ -117,7 +126,6 @@ public class MobileNetworkSwitchControllerTest {
|
|||||||
|
|
||||||
@Test
|
@Test
|
||||||
@UiThreadTest
|
@UiThreadTest
|
||||||
@Ignore
|
|
||||||
public void isAvailable_pSIM_isNotAvailable() {
|
public void isAvailable_pSIM_isNotAvailable() {
|
||||||
when(mSubscription.isEmbedded()).thenReturn(false);
|
when(mSubscription.isEmbedded()).thenReturn(false);
|
||||||
mController.displayPreference(mScreen);
|
mController.displayPreference(mScreen);
|
||||||
@@ -130,7 +138,6 @@ public class MobileNetworkSwitchControllerTest {
|
|||||||
|
|
||||||
@Test
|
@Test
|
||||||
@UiThreadTest
|
@UiThreadTest
|
||||||
@Ignore
|
|
||||||
public void displayPreference_oneEnabledSubscription_switchBarNotHidden() {
|
public void displayPreference_oneEnabledSubscription_switchBarNotHidden() {
|
||||||
doReturn(true).when(mSubscriptionManager).isActiveSubscriptionId(mSubId);
|
doReturn(true).when(mSubscriptionManager).isActiveSubscriptionId(mSubId);
|
||||||
SubscriptionUtil.setAvailableSubscriptionsForTesting(Arrays.asList(mSubscription));
|
SubscriptionUtil.setAvailableSubscriptionsForTesting(Arrays.asList(mSubscription));
|
||||||
@@ -140,7 +147,6 @@ public class MobileNetworkSwitchControllerTest {
|
|||||||
|
|
||||||
@Test
|
@Test
|
||||||
@UiThreadTest
|
@UiThreadTest
|
||||||
@Ignore
|
|
||||||
public void displayPreference_oneDisabledSubscription_switchBarNotHidden() {
|
public void displayPreference_oneDisabledSubscription_switchBarNotHidden() {
|
||||||
doReturn(false).when(mSubscriptionManager).isActiveSubscriptionId(mSubId);
|
doReturn(false).when(mSubscriptionManager).isActiveSubscriptionId(mSubId);
|
||||||
SubscriptionUtil.setAvailableSubscriptionsForTesting(Arrays.asList(mSubscription));
|
SubscriptionUtil.setAvailableSubscriptionsForTesting(Arrays.asList(mSubscription));
|
||||||
@@ -152,7 +158,6 @@ public class MobileNetworkSwitchControllerTest {
|
|||||||
|
|
||||||
@Test
|
@Test
|
||||||
@UiThreadTest
|
@UiThreadTest
|
||||||
@Ignore
|
|
||||||
public void displayPreference_subscriptionEnabled_switchIsOn() {
|
public void displayPreference_subscriptionEnabled_switchIsOn() {
|
||||||
when(mSubscriptionManager.isActiveSubscriptionId(mSubId)).thenReturn(true);
|
when(mSubscriptionManager.isActiveSubscriptionId(mSubId)).thenReturn(true);
|
||||||
mController.displayPreference(mScreen);
|
mController.displayPreference(mScreen);
|
||||||
@@ -162,7 +167,6 @@ public class MobileNetworkSwitchControllerTest {
|
|||||||
|
|
||||||
@Test
|
@Test
|
||||||
@UiThreadTest
|
@UiThreadTest
|
||||||
@Ignore
|
|
||||||
public void displayPreference_subscriptionDisabled_switchIsOff() {
|
public void displayPreference_subscriptionDisabled_switchIsOff() {
|
||||||
when(mSubscriptionManager.isActiveSubscriptionId(mSubId)).thenReturn(false);
|
when(mSubscriptionManager.isActiveSubscriptionId(mSubId)).thenReturn(false);
|
||||||
|
|
||||||
@@ -174,7 +178,6 @@ public class MobileNetworkSwitchControllerTest {
|
|||||||
|
|
||||||
@Test
|
@Test
|
||||||
@UiThreadTest
|
@UiThreadTest
|
||||||
@Ignore
|
|
||||||
public void switchChangeListener_fromEnabledToDisabled_setSubscriptionEnabledCalledCorrectly() {
|
public void switchChangeListener_fromEnabledToDisabled_setSubscriptionEnabledCalledCorrectly() {
|
||||||
when(mSubscriptionManager.isActiveSubscriptionId(mSubId)).thenReturn(true);
|
when(mSubscriptionManager.isActiveSubscriptionId(mSubId)).thenReturn(true);
|
||||||
mController.displayPreference(mScreen);
|
mController.displayPreference(mScreen);
|
||||||
@@ -183,18 +186,24 @@ public class MobileNetworkSwitchControllerTest {
|
|||||||
|
|
||||||
final ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class);
|
final ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class);
|
||||||
doNothing().when(mContext).startActivity(intentCaptor.capture());
|
doNothing().when(mContext).startActivity(intentCaptor.capture());
|
||||||
|
|
||||||
|
// set switch off then should start a Activity.
|
||||||
mSwitchBar.setChecked(false);
|
mSwitchBar.setChecked(false);
|
||||||
|
|
||||||
|
when(mSubscriptionManager.isActiveSubscriptionId(mSubId)).thenReturn(false);
|
||||||
|
// Simulate action of back from previous activity.
|
||||||
|
mController.displayPreference(mScreen);
|
||||||
Bundle extra = intentCaptor.getValue().getExtras();
|
Bundle extra = intentCaptor.getValue().getExtras();
|
||||||
|
|
||||||
verify(mContext, times(1)).startActivity(any());
|
verify(mContext, times(1)).startActivity(any());
|
||||||
assertThat(extra.getInt(ToggleSubscriptionDialogActivity.ARG_SUB_ID)).isEqualTo(mSubId);
|
assertThat(extra.getInt(ToggleSubscriptionDialogActivity.ARG_SUB_ID)).isEqualTo(mSubId);
|
||||||
assertThat(extra.getBoolean(ToggleSubscriptionDialogActivity.ARG_enable))
|
assertThat(extra.getBoolean(ToggleSubscriptionDialogActivity.ARG_enable))
|
||||||
.isEqualTo(false);
|
.isEqualTo(false);
|
||||||
|
assertThat(mSwitchBar.isChecked()).isFalse();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@UiThreadTest
|
@UiThreadTest
|
||||||
@Ignore
|
|
||||||
public void switchChangeListener_fromEnabledToDisabled_setSubscriptionEnabledFailed() {
|
public void switchChangeListener_fromEnabledToDisabled_setSubscriptionEnabledFailed() {
|
||||||
when(mSubscriptionManager.setSubscriptionEnabled(eq(mSubId), anyBoolean()))
|
when(mSubscriptionManager.setSubscriptionEnabled(eq(mSubId), anyBoolean()))
|
||||||
.thenReturn(false);
|
.thenReturn(false);
|
||||||
@@ -205,7 +214,12 @@ public class MobileNetworkSwitchControllerTest {
|
|||||||
|
|
||||||
final ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class);
|
final ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class);
|
||||||
doNothing().when(mContext).startActivity(intentCaptor.capture());
|
doNothing().when(mContext).startActivity(intentCaptor.capture());
|
||||||
|
|
||||||
|
// set switch off then should start a Activity.
|
||||||
mSwitchBar.setChecked(false);
|
mSwitchBar.setChecked(false);
|
||||||
|
|
||||||
|
// Simulate action of back from previous activity.
|
||||||
|
mController.displayPreference(mScreen);
|
||||||
Bundle extra = intentCaptor.getValue().getExtras();
|
Bundle extra = intentCaptor.getValue().getExtras();
|
||||||
|
|
||||||
verify(mContext, times(1)).startActivity(any());
|
verify(mContext, times(1)).startActivity(any());
|
||||||
@@ -217,7 +231,6 @@ public class MobileNetworkSwitchControllerTest {
|
|||||||
|
|
||||||
@Test
|
@Test
|
||||||
@UiThreadTest
|
@UiThreadTest
|
||||||
@Ignore
|
|
||||||
public void switchChangeListener_fromDisabledToEnabled_setSubscriptionEnabledCalledCorrectly() {
|
public void switchChangeListener_fromDisabledToEnabled_setSubscriptionEnabledCalledCorrectly() {
|
||||||
when(mSubscriptionManager.isActiveSubscriptionId(mSubId)).thenReturn(false);
|
when(mSubscriptionManager.isActiveSubscriptionId(mSubId)).thenReturn(false);
|
||||||
mController.displayPreference(mScreen);
|
mController.displayPreference(mScreen);
|
||||||
@@ -233,4 +246,24 @@ public class MobileNetworkSwitchControllerTest {
|
|||||||
assertThat(extra.getInt(ToggleSubscriptionDialogActivity.ARG_SUB_ID)).isEqualTo(mSubId);
|
assertThat(extra.getInt(ToggleSubscriptionDialogActivity.ARG_SUB_ID)).isEqualTo(mSubId);
|
||||||
assertThat(extra.getBoolean(ToggleSubscriptionDialogActivity.ARG_enable)).isEqualTo(true);
|
assertThat(extra.getBoolean(ToggleSubscriptionDialogActivity.ARG_enable)).isEqualTo(true);
|
||||||
}
|
}
|
||||||
|
@Test
|
||||||
|
@UiThreadTest
|
||||||
|
public void onResumeAndonPause_registerAndUnregisterTelephonyCallback() {
|
||||||
|
mController.onResume();
|
||||||
|
|
||||||
|
verify(mTelephonyManager)
|
||||||
|
.registerTelephonyCallback(any(Executor.class), any(TelephonyCallback.class));
|
||||||
|
|
||||||
|
mController.onPause();
|
||||||
|
verify(mTelephonyManager)
|
||||||
|
.unregisterTelephonyCallback(any(TelephonyCallback.class));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@UiThreadTest
|
||||||
|
public void onPause_doNotRegisterAndUnregisterTelephonyCallback() {
|
||||||
|
mController.onPause();
|
||||||
|
verify(mTelephonyManager, times(0))
|
||||||
|
.unregisterTelephonyCallback(any(TelephonyCallback.class));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user