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

Default to enable oem-unlocking preference

Browse Source 
Whether the device supports carriorlock or not, oem-unlocking preference
will be enabled by default, except sdk_gphone_x86-eng target.

Fixes: 129982117
Test: emulator, robotest
Change-Id: I02af50e425fe5a93c244bbf8fe8bd2682275974f
This commit is contained in:
Mill Chen
2019-04-10 17:34:20 -07:00
parent 3d46fcd5b4
commit 7b1ec94fc9
2 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
tests/robotests/src/com/android/settings/development/OemUnlockPreferenceControllerTest.java
View File

@@ -32,6 +32,7 @@ import android.app.Activity;
import android.content.Context;
import android.content.pm.PackageManager;
import android.content.res.Resources;
import android.os.Build;
import android.os.UserManager;
import android.service.oemlock.OemLockManager;
import android.telephony.TelephonyManager;
@@ -48,6 +49,8 @@ import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
@RunWith(RobolectricTestRunner.class)
public class OemUnlockPreferenceControllerTest {
@@ -93,11 +96,19 @@ public class OemUnlockPreferenceControllerTest {
}
@Test
public void OemUnlockPreferenceController_shouldNotCrashWhenMissingFEATURE_TELEPHONY_CARRIERLOCK() {
when(mContext.getPackageManager().hasSystemFeature(PackageManager
.FEATURE_TELEPHONY_CARRIERLOCK)).thenReturn(false);
when(mContext.getSystemService(Context.OEM_LOCK_SERVICE)).thenThrow
(new RuntimeException());
@Config(qualifiers = "mcc999")
public void OemUnlockPreferenceController_shouldNotCrashInEmulatorEngBuild() {
ReflectionHelpers.setStaticField(Build.class, "IS_EMULATOR", true);
ReflectionHelpers.setStaticField(Build.class, "IS_ENG", true);
new OemUnlockPreferenceController(mContext, mActivity, mFragment);
}
@Test
@Config(qualifiers = "mcc999")
public void OemUnlockPreferenceController_shouldNotCrashInOtherBuild() {
ReflectionHelpers.setStaticField(Build.class, "IS_EMULATOR", false);
ReflectionHelpers.setStaticField(Build.class, "IS_ENG", false);
new OemUnlockPreferenceController(mContext, mActivity, mFragment);
}