From d44760ca76077ba167e6c8a7f879250b7c5907ca Mon Sep 17 00:00:00 2001 From: dakkar Date: Fri, 13 Jul 2018 15:06:23 +0100 Subject: smaller FRP patch --- .../0001-disable-FRP.patch | 30 ++++++++-------------- 1 file changed, 10 insertions(+), 20 deletions(-) (limited to 'patches') diff --git a/patches/platform_frameworks_base_services/0001-disable-FRP.patch b/patches/platform_frameworks_base_services/0001-disable-FRP.patch index d163118..1242427 100644 --- a/patches/platform_frameworks_base_services/0001-disable-FRP.patch +++ b/patches/platform_frameworks_base_services/0001-disable-FRP.patch @@ -1,28 +1,18 @@ -From 5a539952d2fd876fc06b83de8dee406c2b98cd53 Mon Sep 17 00:00:00 2001 +From fb81c4427c098c82174c84c3544e6d9f46973ba3 Mon Sep 17 00:00:00 2001 From: dakkar -Date: Fri, 13 Jul 2018 10:47:34 +0100 +Date: Fri, 13 Jul 2018 15:05:36 +0100 Subject: [PATCH] disable FRP +Change-Id: Ib24d62f8982a7152a912a32696cc18c5bfc7f490 --- - .../android/server/PersistentDataBlockService.java | 27 ++++------------------ - 1 file changed, 5 insertions(+), 22 deletions(-) + .../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..a8965750a69 100644 +index c32a2d10b0b..3e6a4dbd880 100644 --- a/services/core/java/com/android/server/PersistentDataBlockService.java +++ b/services/core/java/com/android/server/PersistentDataBlockService.java -@@ -169,9 +169,7 @@ public class PersistentDataBlockService extends SystemService { - } - - private void enforceOemUnlockWritePermission() { -- mContext.enforceCallingOrSelfPermission( -- Manifest.permission.OEM_UNLOCK_STATE, -- "Can't modify OEM unlock state"); -+ return; - } - - private void enforceUid(int callingUid) { -@@ -305,6 +303,7 @@ public class PersistentDataBlockService extends SystemService { +@@ -305,6 +305,7 @@ public class PersistentDataBlockService extends SystemService { } private void formatPartitionLocked(boolean setOemUnlockEnabled) { @@ -30,7 +20,7 @@ index c32a2d10b0b..a8965750a69 100644 DataOutputStream outputStream; try { outputStream = new DataOutputStream(new FileOutputStream(new File(mDataBlockFile))); -@@ -331,6 +330,7 @@ public class PersistentDataBlockService extends SystemService { +@@ -331,6 +332,7 @@ public class PersistentDataBlockService extends SystemService { } private void doSetOemUnlockEnabledLocked(boolean enabled) { @@ -38,7 +28,7 @@ index c32a2d10b0b..a8965750a69 100644 FileOutputStream outputStream; try { outputStream = new FileOutputStream(new File(mDataBlockFile)); -@@ -359,25 +359,7 @@ public class PersistentDataBlockService extends SystemService { +@@ -359,25 +361,7 @@ public class PersistentDataBlockService extends SystemService { } private boolean doGetOemUnlockEnabled() { @@ -65,7 +55,7 @@ index c32a2d10b0b..a8965750a69 100644 } private long doGetMaximumDataBlockSize() { -@@ -503,6 +485,7 @@ public class PersistentDataBlockService extends SystemService { +@@ -503,6 +487,7 @@ public class PersistentDataBlockService extends SystemService { @Override public void setOemUnlockEnabled(boolean enabled) throws SecurityException { -- cgit v1.2.3