From 8c8dc284c95fff8aff1a0376cb743c48f2a2b51d Mon Sep 17 00:00:00 2001 From: Tad Date: Sun, 22 Oct 2017 23:29:46 -0400 Subject: [PATCH] Last patch prob doesnt fix that --- .../0002-Keystore.patch | 40 ------------------- Scripts/LAOS-14.1_Patches.sh | 1 - 2 files changed, 41 deletions(-) delete mode 100644 Patches/LineageOS-14.1/android_frameworks_base/0002-Keystore.patch diff --git a/Patches/LineageOS-14.1/android_frameworks_base/0002-Keystore.patch b/Patches/LineageOS-14.1/android_frameworks_base/0002-Keystore.patch deleted file mode 100644 index 8648fef7..00000000 --- a/Patches/LineageOS-14.1/android_frameworks_base/0002-Keystore.patch +++ /dev/null @@ -1,40 +0,0 @@ -From dee29e1d481bb201f249fbc97855767698f77be3 Mon Sep 17 00:00:00 2001 -From: Tad -Date: Sun, 22 Oct 2017 23:21:58 -0400 -Subject: [PATCH] Fix Keystore - -See the following -https://github.com/LineageOS/android_frameworks_base/commit/4812563f68c87278af68309662433279d10f573e -https://github.com/CopperheadOS/platform_frameworks_base/commit/67a220a896ff4b28706eda855ebb2d52f8dcbfd0 -https://github.com/flocke/andOTP/issues/16 -https://jira.lineageos.org/browse/BUGBASH-590 - -Change-Id: I733d7d6620ff50930dd7b5a579607d78fa5a12b0 ---- - core/java/android/app/ActivityThread.java | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java -index eb257c59b5c..e6a66a56b00 100644 ---- a/core/java/android/app/ActivityThread.java -+++ b/core/java/android/app/ActivityThread.java -@@ -82,6 +82,7 @@ import android.os.Trace; - import android.os.TransactionTooLargeException; - import android.os.UserHandle; - import android.provider.Settings; -+import android.security.keystore.AndroidKeyStoreProvider; - import android.security.NetworkSecurityPolicy; - import android.security.net.config.NetworkSecurityConfigProvider; - import android.util.AndroidRuntimeException; -@@ -6161,6 +6162,8 @@ public final class ActivityThread { - // Set the reporter for event logging in libcore - EventLogger.setReporter(new EventLoggingReporter()); - -+ AndroidKeyStoreProvider.install(); -+ - // Make sure TrustedCertificateStore looks in the right place for CA certificates - final File configDir = Environment.getUserConfigDirectory(UserHandle.myUserId()); - TrustedCertificateStore.setDefaultUserDirectory(configDir); --- -2.14.2 - diff --git a/Scripts/LAOS-14.1_Patches.sh b/Scripts/LAOS-14.1_Patches.sh index 8c23b34e..62589392 100755 --- a/Scripts/LAOS-14.1_Patches.sh +++ b/Scripts/LAOS-14.1_Patches.sh @@ -109,7 +109,6 @@ sed -i 's|config_longPressOnHomeBehavior">2|config_longPressOnHomeBehavior">0|' sed -i 's|config_doubleTapOnHomeBehavior">0|config_doubleTapOnHomeBehavior">8|' core/res/res/values/config.xml; #sed -i 's|config_permissionReviewRequired">false|config_permissionReviewRequired">true|' core/res/res/values/config.xml; #XXX: Super awesome, but breaks quick tiles patch -p1 < $patches"android_frameworks_base/0001-Reduced_Resolution.patch" #Allow reducing resolution to save power -patch -p1 < $patches"android_frameworks_base/0002-Keystore.patch" #Fix Keystore patch -p1 < $patches"android_frameworks_base/0003-Signature_Spoofing.patch" #Allow packages to spoof their signature (MicroG) patch -p1 < $patches"android_frameworks_base/0005-Harden_Sig_Spoofing.patch" #Restrict signature spoofing to system apps signed with the platform key rm -rf packages/PrintRecommendationService; #App that just creates popups to install proprietary print apps