Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 15b2e793 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "move connecteddevice test package to sdk 26"

parents ceaeee8c 18468c9b

tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment2Test.java

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ import static org.mockito.Mockito.verifyZeroInteractions; 
import static org.mockito.Mockito.when;



@RunWith(SettingsRobolectricTestRunner.class)

@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)

@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)

public class ConnectedDeviceDashboardFragment2Test {



    @Mock(answer = Answers.RETURNS_DEEP_STUBS)

tests/robotests/src/com/android/settings/connecteddevice/UsbModePreferenceControllerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ import static org.mockito.Matchers.any; 
import static org.mockito.Mockito.when;



@RunWith(SettingsRobolectricTestRunner.class)

@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)

@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)

public class UsbModePreferenceControllerTest {



    @Mock(answer = RETURNS_DEEP_STUBS)