summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--build.sh4
-rw-r--r--patches/platform_frameworks_base_services/0001-disable-FRP.patch (renamed from patches/platform_frameworks_base_services/0001-disable-frp.patch)18
2 files changed, 17 insertions, 5 deletions
diff --git a/build.sh b/build.sh
index 8f7df32..dd7f6c6 100644
--- a/build.sh
+++ b/build.sh
@@ -38,8 +38,8 @@ function setup_code() {
rm -f device/*/sepolicy/common/private/genfs_contexts
- bash "$thidir/apply-patches.sh" patches
- bash "$thidir/apply-patches.sh" dakkar-patches
+ bash "$thisdir/apply-patches.sh" patches
+ bash "$thisdir/apply-patches.sh" dakkar-patches
}
if [[ "$1" == "setup" ]]; then
diff --git a/patches/platform_frameworks_base_services/0001-disable-frp.patch b/patches/platform_frameworks_base_services/0001-disable-FRP.patch
index c7bc2f0..d163118 100644
--- a/patches/platform_frameworks_base_services/0001-disable-frp.patch
+++ b/patches/platform_frameworks_base_services/0001-disable-FRP.patch
@@ -1,7 +1,16 @@
-diff --git i/services/core/java/com/android/server/PersistentDataBlockService.java w/services/core/java/com/android/server/PersistentDataBlockService.java
+From 5a539952d2fd876fc06b83de8dee406c2b98cd53 Mon Sep 17 00:00:00 2001
+From: dakkar <dakkar@thenautilus.net>
+Date: Fri, 13 Jul 2018 10:47:34 +0100
+Subject: [PATCH] disable FRP
+
+---
+ .../android/server/PersistentDataBlockService.java | 27 ++++------------------
+ 1 file changed, 5 insertions(+), 22 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
---- i/services/core/java/com/android/server/PersistentDataBlockService.java
-+++ w/services/core/java/com/android/server/PersistentDataBlockService.java
+--- 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 {
}
@@ -64,3 +73,6 @@ index c32a2d10b0b..a8965750a69 100644
// do not allow monkey to flip the flag
if (ActivityManager.isUserAMonkey()) {
return;
+--
+2.16.4
+