diff options
author | dakkar <dakkar@thenautilus.net> | 2018-07-13 10:48:34 +0100 |
---|---|---|
committer | dakkar <dakkar@thenautilus.net> | 2018-07-13 10:48:34 +0100 |
commit | a43e159aef523c4ccec1b3e491faa95ba2bd1de4 (patch) | |
tree | bfa8b65b684d0123bddc9f4c25403583fc983c55 /patches/platform_frameworks_base_services/0001-disable-frp.patch | |
parent | fix typo in manifest (diff) | |
download | dakkar-android-huawei-m5-a43e159aef523c4ccec1b3e491faa95ba2bd1de4.tar.gz dakkar-android-huawei-m5-a43e159aef523c4ccec1b3e491faa95ba2bd1de4.tar.bz2 dakkar-android-huawei-m5-a43e159aef523c4ccec1b3e491faa95ba2bd1de4.zip |
fix patching and patches
Diffstat (limited to 'patches/platform_frameworks_base_services/0001-disable-frp.patch')
-rw-r--r-- | patches/platform_frameworks_base_services/0001-disable-frp.patch | 66 |
1 files changed, 0 insertions, 66 deletions
diff --git a/patches/platform_frameworks_base_services/0001-disable-frp.patch b/patches/platform_frameworks_base_services/0001-disable-frp.patch deleted file mode 100644 index c7bc2f0..0000000 --- a/patches/platform_frameworks_base_services/0001-disable-frp.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff --git i/services/core/java/com/android/server/PersistentDataBlockService.java w/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 -@@ -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 { - } - - private void formatPartitionLocked(boolean setOemUnlockEnabled) { -+ setOemUnlockEnabled = true; - DataOutputStream outputStream; - try { - outputStream = new DataOutputStream(new FileOutputStream(new File(mDataBlockFile))); -@@ -331,6 +330,7 @@ public class PersistentDataBlockService extends SystemService { - } - - private void doSetOemUnlockEnabledLocked(boolean enabled) { -+ enabled = true; - FileOutputStream outputStream; - try { - outputStream = new FileOutputStream(new File(mDataBlockFile)); -@@ -359,25 +359,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 +485,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; |