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

Merge "[Settings] Avoid from Settings crash" into rvc-dev am: d227755be8 am: d169749e7d am: adce5a2ec1 am: e7a6a2c302

Browse Source 
Change-Id: Ic1b13d094291cf06644533f59b5195183904b5a4
This commit is contained in:
TreeHugger Robot
2020-03-25 00:37:49 +00:00
committed by Automerger Merge Worker
parent 2829bfbc5c e7a6a2c302
commit 715687986f
2 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,6 +22,7 @@ import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.anyInt;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.robolectric.Shadows.shadowOf;
import android.content.Context;
@@ -39,6 +40,7 @@ import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.android.internal.telephony.TelephonyIntents;
import com.android.settings.network.ProxySubscriptionManager;
import org.junit.After;
import org.junit.Before;
@@ -109,6 +111,12 @@ public class MobileNetworkActivityTest {
private SubscriptionInfo mSubscriptionInFragment;
@Override
void registerActiveSubscriptionsListener() {
mProxySubscriptionMgr = mock(ProxySubscriptionManager.class);
onChanged();
}
@Override
void switchFragment(SubscriptionInfo subInfo) {
mSubscriptionInFragment = subInfo;