diff options
| author | Guang Zhu <guangzhu@google.com> | 2014-09-12 15:14:00 -0700 |
|---|---|---|
| committer | Guang Zhu <guangzhu@google.com> | 2014-09-12 22:17:14 +0000 |
| commit | 514c58045980998909883bfed5810c9508fd2f7b (patch) | |
| tree | b34a7efd5a3eb3af1783b62b7596701f7ce93508 /services | |
| parent | ce8a52f9aa28e3f5a1d62e4b57f94f1fc8ce3edb (diff) | |
| download | frameworks_base-514c58045980998909883bfed5810c9508fd2f7b.zip frameworks_base-514c58045980998909883bfed5810c9508fd2f7b.tar.gz frameworks_base-514c58045980998909883bfed5810c9508fd2f7b.tar.bz2 | |
do not allow monkey to flip OEM unlock flag
Bug: 11435021
Change-Id: I3a6865bc6c9fde245d8f4af3230716eac4a3f1b1
Diffstat (limited to 'services')
| -rw-r--r-- | services/core/java/com/android/server/PersistentDataBlockService.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/PersistentDataBlockService.java b/services/core/java/com/android/server/PersistentDataBlockService.java index 2896f60..6f378fd 100644 --- a/services/core/java/com/android/server/PersistentDataBlockService.java +++ b/services/core/java/com/android/server/PersistentDataBlockService.java @@ -17,6 +17,7 @@ package com.android.server; import android.Manifest; +import android.app.ActivityManager; import android.content.Context; import android.content.pm.PackageManager; import android.os.Binder; @@ -26,7 +27,9 @@ import android.os.SystemProperties; import android.os.UserHandle; import android.service.persistentdata.IPersistentDataBlockService; import android.util.Slog; + import com.android.internal.R; + import libcore.io.IoUtils; import java.io.DataInputStream; @@ -241,6 +244,10 @@ public class PersistentDataBlockService extends SystemService { @Override public void setOemUnlockEnabled(boolean enabled) { + // do not allow monkey to flip the flag + if (ActivityManager.isUserAMonkey()) { + return; + } enforceOemUnlockPermission(); FileOutputStream outputStream; try { |