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

Merge "Add a Global setting for disabling OEM unlocking setting" into nyc-mr1-dev

Browse Source 
am: 030060a321

* commit '030060a32166990585cf0ef2c007e7f787e5dd7d':
  Add a Global setting for disabling OEM unlocking setting

Change-Id: I8fa26a26e174e0e44875eb925aad9f3978373e04
This commit is contained in:
Steven Ng
2016-05-16 09:25:39 +00:00
committed by android-build-merger
parent e592a41727 030060a321
commit 958d1253c5
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/DevelopmentSettings.java
View File

@@ -1014,7 +1014,9 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
flashLockState = mOemUnlockManager.getFlashLockState();
}
return flashLockState != PersistentDataBlockManager.FLASH_LOCK_UNLOCKED;
return flashLockState != PersistentDataBlockManager.FLASH_LOCK_UNLOCKED
&& Settings.Global.getInt(getActivity().getContentResolver(),
Settings.Global.OEM_UNLOCK_DISALLOWED, 0) == 0;
}
private void updateOemUnlockOptions() {

10
src/com/android/settings/Utils.java
View File

@@ -759,9 +759,13 @@ public final class Utils extends com.android.settingslib.Utils {
* devices allow users to flash other OSes to them.
*/
static void setOemUnlockEnabled(Context context, boolean enabled) {
PersistentDataBlockManager manager =(PersistentDataBlockManager)
context.getSystemService(Context.PERSISTENT_DATA_BLOCK_SERVICE);
manager.setOemUnlockEnabled(enabled);
try {
PersistentDataBlockManager manager = (PersistentDataBlockManager)
context.getSystemService(Context.PERSISTENT_DATA_BLOCK_SERVICE);
manager.setOemUnlockEnabled(enabled);
} catch (SecurityException e) {
Log.e(TAG, "Fail to set oem unlock.", e);
}
}
/**