From bfe1b04f8ba9cd5486e26ca4cc30242b3b2f2c7f Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Mon, 16 May 2016 11:20:57 +0100
Subject: [PATCH] Enforce permission before checking OEM unlocking setting

Bug: 28783495
Change-Id: Idb7b191dd8c50a687c8e910656c0325414ecd544
---
 .../java/com/android/server/PersistentDataBlockService.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/services/core/java/com/android/server/PersistentDataBlockService.java b/services/core/java/com/android/server/PersistentDataBlockService.java
index 502629be7cc96..b64363fce719b 100644
--- a/services/core/java/com/android/server/PersistentDataBlockService.java
+++ b/services/core/java/com/android/server/PersistentDataBlockService.java
@@ -443,13 +443,15 @@ public class PersistentDataBlockService extends SystemService {
             if (ActivityManager.isUserAMonkey()) {
                 return;
             }
+
+            enforceOemUnlockPermission();
+            enforceIsAdmin();
+
             // Do not allow oem unlock modification if it has been disallowed.
             if (Settings.Global.getInt(getContext().getContentResolver(),
                     Settings.Global.OEM_UNLOCK_DISALLOWED, 0) == 1) {
                 throw new SecurityException("OEM unlock has been disallowed.");
             }
-            enforceOemUnlockPermission();
-            enforceIsAdmin();
 
             synchronized (mLock) {
                 doSetOemUnlockEnabledLocked(enabled);