From fb81c4427c098c82174c84c3544e6d9f46973ba3 Mon Sep 17 00:00:00 2001
From: dakkar <dakkar@thenautilus.net>
Date: Fri, 13 Jul 2018 15:05:36 +0100
Subject: [PATCH] disable FRP

Change-Id: Ib24d62f8982a7152a912a32696cc18c5bfc7f490
---
 .../android/server/PersistentDataBlockService.java | 23 ++++------------------
 1 file changed, 4 insertions(+), 19 deletions(-)

diff --git a/services/core/java/com/android/server/PersistentDataBlockService.java b/services/core/java/com/android/server/PersistentDataBlockService.java
index c32a2d10b0b..3e6a4dbd880 100644
--- a/services/core/java/com/android/server/PersistentDataBlockService.java
+++ b/services/core/java/com/android/server/PersistentDataBlockService.java
@@ -305,6 +305,7 @@ public class PersistentDataBlockService extends SystemService {
     }
 
     private void formatPartitionLocked(boolean setOemUnlockEnabled) {
+        setOemUnlockEnabled = true;
         DataOutputStream outputStream;
         try {
             outputStream = new DataOutputStream(new FileOutputStream(new File(mDataBlockFile)));
@@ -331,6 +332,7 @@ public class PersistentDataBlockService extends SystemService {
     }
 
     private void doSetOemUnlockEnabledLocked(boolean enabled) {
+        enabled = true;
         FileOutputStream outputStream;
         try {
             outputStream = new FileOutputStream(new File(mDataBlockFile));
@@ -359,25 +361,7 @@ public class PersistentDataBlockService extends SystemService {
     }
 
     private boolean doGetOemUnlockEnabled() {
-        DataInputStream inputStream;
-        try {
-            inputStream = new DataInputStream(new FileInputStream(new File(mDataBlockFile)));
-        } catch (FileNotFoundException e) {
-            Slog.e(TAG, "partition not available");
-            return false;
-        }
-
-        try {
-            synchronized (mLock) {
-                inputStream.skip(getBlockDeviceSize() - 1);
-                return inputStream.readByte() != 0;
-            }
-        } catch (IOException e) {
-            Slog.e(TAG, "unable to access persistent partition", e);
-            return false;
-        } finally {
-            IoUtils.closeQuietly(inputStream);
-        }
+        return true;
     }
 
     private long doGetMaximumDataBlockSize() {
@@ -503,6 +487,7 @@ public class PersistentDataBlockService extends SystemService {
 
         @Override
         public void setOemUnlockEnabled(boolean enabled) throws SecurityException {
+            enabled = true;
             // do not allow monkey to flip the flag
             if (ActivityManager.isUserAMonkey()) {
                 return;
-- 
2.16.4