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

Merge "resolve merge conflicts of d42d9a41f6 to sc-dev" into sc-dev am: 321f413343

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13904045

Change-Id: I019ec2f2f5ed6ec8d2be519d821ee7f139af4bb3
This commit is contained in:
Colin Cross
2021-03-17 22:02:02 +00:00
committed by Automerger Merge Worker
parent 87c1d43500 321f413343
commit 1871042664
55 changed files with 27 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tests/unit/src/com/android/settings/network/MultiNetworkHeaderControllerTest.java
View File

@@ -41,7 +41,6 @@ import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
@RunWith(AndroidJUnit4.class)
public class MultiNetworkHeaderControllerTest {
private static final String KEY_HEADER = "multi_network_header";

1
tests/unit/src/com/android/settings/network/telephony/EuiccPreferenceControllerTest.java
View File

@@ -38,7 +38,6 @@ import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
@RunWith(AndroidJUnit4.class)
public class EuiccPreferenceControllerTest {
private static final int SUB_ID = 2;

1
tests/unit/src/com/android/settings/network/telephony/MobileDataPreferenceControllerTest.java
View File

@@ -47,7 +47,6 @@ import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
@RunWith(AndroidJUnit4.class)
public class MobileDataPreferenceControllerTest {
private static final int SUB_ID = 2;