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

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

Merge "move survey and system test package to sdk 26"

parents 9f304c7f 3074f25b

tests/robotests/src/com/android/settings/survey/SurveyMixinTest.java

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ import org.robolectric.annotation.Config; 
import org.robolectric.util.ReflectionHelpers;



@RunWith(SettingsRobolectricTestRunner.class)

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

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

public class SurveyMixinTest {



    private static final String FAKE_KEY = "fake_key";

tests/robotests/src/com/android/settings/system/FactoryResetPreferenceControllerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ import org.robolectric.annotation.Config; 
@RunWith(SettingsRobolectricTestRunner.class)

@Config(

    manifest = TestConfig.MANIFEST_PATH,

    sdk = TestConfig.SDK_VERSION,

    sdk = TestConfig.SDK_VERSION_O,

    shadows = {ShadowSecureSettings.class, ShadowUtils.class}

)

public class FactoryResetPreferenceControllerTest {

tests/robotests/src/com/android/settings/system/SystemDashboardFragmentTest.java

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ import org.robolectric.annotation.Config; 
import java.util.List;



@RunWith(SettingsRobolectricTestRunner.class)

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

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

        shadows = {

                ShadowUserManager.class,

                SettingsShadowResources.class,