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

resolve merge conflicts of d42d9a41f6 to sc-dev

Browse Source 
Change-Id: Ifa6a4af09d7cd45773a8c057416ab90fac23061e
This commit is contained in:
Janis Danisevskis
2021-03-17 19:07:44 +00:00
parent 0cfa67f8a8 d42d9a41f6
commit 5cef487b4b
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;