AtaraxiaDev/divestos-build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

15.1: More fixes

Browse Source
This commit is contained in:
Tad 2018-02-28 08:22:35 -05:00
parent 8c15364b54
commit 90ecbd9857
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Patches/LineageOS-15.1/android_system_vold/0001-AES256.patch
View File

@ -1,19 +1,19 @@
From f97f345e14ab731b87c1f8330718db90d49061e7 Mon Sep 17 00:00:00 2001 From 1a5bbf0ee895bbd66fb3ce66be44b1074bb20324 Mon Sep 17 00:00:00 2001
From: Tad <tad@spotco.us> From: Tad <tad@spotco.us>
Date: Mon, 12 Feb 2018 06:12:29 -0500 Date: Wed, 28 Feb 2018 08:21:28 -0500
Subject: [PATCH] Build time variable for AES-256 encryption Subject: [PATCH] Build time variable for AES-256 encryption
Change-Id: I14efcfddabb6bd889b90cff59f26ca47c9883eb0 Change-Id: I25eba5939c965323e4ffa6d95c6736b671c51e09
--- ---
Android.mk | 4 ++++ Android.mk | 4 ++++
cryptfs.cpp | 9 ++++++++- cryptfs.cpp | 9 ++++++++-
2 files changed, 12 insertions(+), 1 deletion(-) 2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/Android.mk b/Android.mk diff --git a/Android.mk b/Android.mk
index 29a7852..2962180 100644 index 14bf99a..0e9f3e1 100644
--- a/Android.mk --- a/Android.mk
+++ b/Android.mk +++ b/Android.mk
@@ -114,6 +114,10 @@ ifeq ($(TARGET_HW_DISK_ENCRYPTION),true) @@ -115,6 +115,10 @@ ifeq ($(TARGET_HW_DISK_ENCRYPTION),true)
vold_cflags += -DCONFIG_HW_DISK_ENCRYPTION vold_cflags += -DCONFIG_HW_DISK_ENCRYPTION
endif endif
@ -21,9 +21,9 @@ index 29a7852..2962180 100644
+LOCAL_CFLAGS += -DCONFIG_STRONG_ENCRYPTION +LOCAL_CFLAGS += -DCONFIG_STRONG_ENCRYPTION
+endif +endif
+ +
ifeq ($(TARGET_KERNEL_HAVE_EXFAT),true) ifneq ($(TARGET_EXFAT_DRIVER),)
vold_cflags += -DCONFIG_KERNEL_HAVE_EXFAT vold_cflags += -DCONFIG_EXFAT_DRIVER=\"$(TARGET_EXFAT_DRIVER)\"
endif mini_src_files += fs/Exfat.cpp
diff --git a/cryptfs.cpp b/cryptfs.cpp diff --git a/cryptfs.cpp b/cryptfs.cpp
index f01929a..7fb3ffa 100644 index f01929a..7fb3ffa 100644
--- a/cryptfs.cpp --- a/cryptfs.cpp
@ -55,5 +55,5 @@ index f01929a..7fb3ffa 100644
#define RSA_EXPONENT 0x10001 #define RSA_EXPONENT 0x10001
#define KEYMASTER_CRYPTFS_RATE_LIMIT 1 // Maximum one try per second #define KEYMASTER_CRYPTFS_RATE_LIMIT 1 // Maximum one try per second
-- --
2.16.1 2.16.2

4
Scripts/LineageOS-15.1/Patch.sh
View File

@ -143,10 +143,6 @@ enterAndClear "packages/apps/Updater"
patch -p1 < $patches"android_packages_apps_Updater/0001-Server.patch" #Switch to our server patch -p1 < $patches"android_packages_apps_Updater/0001-Server.patch" #Switch to our server
enterAndClear "packages/apps/WallpaperPicker" enterAndClear "packages/apps/WallpaperPicker"
rm res/drawable-nodpi/{*.png,*.jpg} res/values-nodpi/wallpapers.xml; #Remove old ones
cp -r $dosWallpapers'Compressed/.' res/drawable-nodpi/; #Add ours
cp -r $dosWallpapers"Thumbs/." res/drawable-nodpi/;
cp $dosWallpapers"wallpapers.xml" res/values-nodpi/wallpapers.xml;
sed -i 's/req.touchEnabled = touchEnabled;/req.touchEnabled = true;/' src/com/android/wallpaperpicker/WallpaperCropActivity.java; #Allow scrolling sed -i 's/req.touchEnabled = touchEnabled;/req.touchEnabled = true;/' src/com/android/wallpaperpicker/WallpaperCropActivity.java; #Allow scrolling
sed -i 's/mCropView.setTouchEnabled(req.touchEnabled);/mCropView.setTouchEnabled(true);/' src/com/android/wallpaperpicker/WallpaperCropActivity.java; sed -i 's/mCropView.setTouchEnabled(req.touchEnabled);/mCropView.setTouchEnabled(true);/' src/com/android/wallpaperpicker/WallpaperCropActivity.java;
sed -i 's/WallpaperUtils.EXTRA_WALLPAPER_OFFSET, 0);/WallpaperUtils.EXTRA_WALLPAPER_OFFSET, 0.5f);/' src/com/android/wallpaperpicker/WallpaperPickerActivity.java; #Center aligned by default sed -i 's/WallpaperUtils.EXTRA_WALLPAPER_OFFSET, 0);/WallpaperUtils.EXTRA_WALLPAPER_OFFSET, 0.5f);/' src/com/android/wallpaperpicker/WallpaperPickerActivity.java; #Center aligned by default