Git-Mirrors/DivestOS
1
0
Fork 0
mirror of https://github.com/Divested-Mobile/DivestOS-Build.git synced 2024-12-24 23:19:31 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add a patch to fix the keystore

Browse Source
This commit is contained in:
Tad 2017-10-22 23:24:07 -04:00
parent 1060ad06fa
commit 106e5d1708
3 changed files with 50 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Misc/dns.txt Normal file
View File

@ -0,0 +1,7 @@
frameworks
base/core/res/res/values/config.xml
base/packages/SettingsLib/res/values/strings.xml
base/services/core/java/com/android/server/connectivity/NetworkDiagnostics.java
base/services/core/java/com/android/server/connectivity/Tethering.java

40
Patches/LineageOS-14.1/android_frameworks_base/0002-Keystore.patch Normal file
View File

@ -0,0 +1,40 @@
From dee29e1d481bb201f249fbc97855767698f77be3 Mon Sep 17 00:00:00 2001
From: Tad <tad@spotco.us>
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

5
Scripts/LAOS-14.1_Patches.sh
View File

@ -107,8 +107,9 @@ sed -i '0,/wifi,cell,battery/s/wifi,cell,battery,dnd,flashlight,rotation,bt,airp
sed -i 's/com.android.messaging/org.smssecure.smssecure/' core/res/res/values/config.xml; #Change default SMS app to Silence
sed -i 's|config_longPressOnHomeBehavior">2|config_longPressOnHomeBehavior">0|' core/res/res/values/config.xml;
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
#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
@ -190,7 +191,7 @@ enter "packages/inputmethods/LatinIME"
patch -p1 < $patches"android_packages_inputmethods_LatinIME/0001-Voice.patch" #Remove voice input key
enter "packages/services/Telephony"
patch -p1 < $patches"android_packages_services_Telephony/0001-LTE_Only.patch" #LTE only preferred network mode choice
patch -p1 < $patches"android_packages_services_Telephony/0001-LTE_Only.patch" #LTE only preferred network mode choice #From Copperhead before their LICENSE was added, and its just some constants anyway...
enter "system/core"
cat /tmp/ar/hosts >> rootdir/etc/hosts #Merge in our HOSTS file