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

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

Merge changes I886a7277,I25d96c82 

* changes:
  Move development test package to sdk 26
  Move OemUnlockPreferenceControllerTest to sdk 26
parents 96c1ecd5 876d3c13

src/com/android/settings/development/OemUnlockPreferenceController.java

+8 −2
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ public class OemUnlockPreferenceController extends DeveloperOptionsPreferenceCon 
    @Override

    public void updateState(Preference preference) {

        super.updateState(preference);

        mPreference.setChecked(mOemLockManager.isOemUnlockAllowed());

        mPreference.setChecked(isOemUnlockedAllowed());

        updateOemUnlockSettingDescription();

        // Showing mEnableOemUnlock preference as device has persistent data block.

        mPreference.setDisabledByAdmin(null);
@@ -183,7 +183,8 @@ public class OemUnlockPreferenceController extends DeveloperOptionsPreferenceCon 
    /**

     * Returns {@code true} if the bootloader has been unlocked. Otherwise, returns {code false}.

     */

    private boolean isBootloaderUnlocked() {

    @VisibleForTesting

    boolean isBootloaderUnlocked() {

        return mOemLockManager.isDeviceOemUnlocked();

    }
@@ -216,4 +217,9 @@ public class OemUnlockPreferenceController extends DeveloperOptionsPreferenceCon 
                userHandle);

    }



    @VisibleForTesting

    boolean isOemUnlockedAllowed() {

        return mOemLockManager.isOemUnlockAllowed();

    }



}

tests/robotests/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceControllerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ import org.robolectric.RuntimeEnvironment; 
import org.robolectric.annotation.Config;



@RunWith(SettingsRobolectricTestRunner.class)

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

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

public class AbstractBluetoothA2dpPreferenceControllerTest {



    @Mock

tests/robotests/src/com/android/settings/development/AdbPreferenceControllerTest.java

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



@RunWith(SettingsRobolectricTestRunner.class)

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

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

public class AdbPreferenceControllerTest {



    @Mock

tests/robotests/src/com/android/settings/development/AllowAppsOnExternalPreferenceControllerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ import org.robolectric.RuntimeEnvironment; 
import org.robolectric.annotation.Config;



@RunWith(SettingsRobolectricTestRunner.class)

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

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

public class AllowAppsOnExternalPreferenceControllerTest {



    @Mock

tests/robotests/src/com/android/settings/development/AnimatorDurationScalePreferenceControllerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,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 AnimatorDurationScalePreferenceControllerTest {



    @Mock