From c914a655a51f90797c78ab9d008ac4d2b8d21afc Mon Sep 17 00:00:00 2001 From: Tad Date: Mon, 25 Jun 2018 10:16:32 -0400 Subject: [PATCH] Fixup previous commits --- .../0001-UnifiedNLP_Support.patch | 26 +++++++++++++++++++ Scripts/Common/Functions.sh | 2 +- Scripts/LineageOS-14.1/Patch.sh | 1 + Scripts/LineageOS-15.1/Patch.sh | 1 + Scripts/init.sh | 8 +++--- TODO | 6 ++--- 6 files changed, 36 insertions(+), 8 deletions(-) create mode 100644 Patches/Common/android_frameworks_base/0001-UnifiedNLP_Support.patch diff --git a/Patches/Common/android_frameworks_base/0001-UnifiedNLP_Support.patch b/Patches/Common/android_frameworks_base/0001-UnifiedNLP_Support.patch new file mode 100644 index 00000000..82ca8adc --- /dev/null +++ b/Patches/Common/android_frameworks_base/0001-UnifiedNLP_Support.patch @@ -0,0 +1,26 @@ +From aff27a258e5585172781d4ba128294ffc7e84b82 Mon Sep 17 00:00:00 2001 +From: Tad +Date: Mon, 25 Jun 2018 09:58:29 -0400 +Subject: [PATCH] Add microG UnifiedNLP to available location providers + +Change-Id: I4642308d5fd5e4230619b20b15eddf28dd193edd +--- + core/res/res/values/config.xml | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml +index c29ff3c90a9..4e00c153a48 100755 +--- a/core/res/res/values/config.xml ++++ b/core/res/res/values/config.xml +@@ -1474,6 +1474,8 @@ + + + com.android.location.fused ++ ++ org.microg.nlp + + + +-- +2.18.0 + diff --git a/Scripts/Common/Functions.sh b/Scripts/Common/Functions.sh index 73beb4bd..7c2583ee 100644 --- a/Scripts/Common/Functions.sh +++ b/Scripts/Common/Functions.sh @@ -99,7 +99,7 @@ generateBootAnimationShine() { color=$1; style=$2; output=$3; - if [ "$style" = "gradient"]; then + if [ "$style" = "gradient" ]; then convert -size 1024x128 -define gradient:angle=90 plasma:"$color" \( +clone -flop \) +append "$output"; elif [ "$style" = "plasma" ]; then convert -size 2048x128 plasma:"$color" "$output"; diff --git a/Scripts/LineageOS-14.1/Patch.sh b/Scripts/LineageOS-14.1/Patch.sh index 73d92fe6..3b6c8545 100755 --- a/Scripts/LineageOS-14.1/Patch.sh +++ b/Scripts/LineageOS-14.1/Patch.sh @@ -84,6 +84,7 @@ sed -i 's|config_permissionReviewRequired">false|config_permissionReviewRequired patch -p1 < "$patches/android_frameworks_base/0001-Reduced_Resolution.patch"; #Allow reducing resolution to save power TODO: Add 800x480 if [ "$MICROG_INCLUDED" = "FULL" ]; then patch -p1 < "$patches/android_frameworks_base/0003-Signature_Spoofing.patch"; fi; #Allow packages to spoof their signature (microG) if [ "$MICROG_INCLUDED" = "FULL" ]; then patch -p1 < "$patches/android_frameworks_base/0005-Harden_Sig_Spoofing.patch"; fi; #Restrict signature spoofing to system apps signed with the platform key +if [ "$MICROG_INCLUDED" = "NLP" ]; then patch -p1 < "$patchesCommon/android_frameworks_base/0001-UnifiedNLP_Support.patch"; fi; #Add UnifiedNLP to location providers changeDefaultDNS; #patch -p1 < "$patches/android_frameworks_base/0007-Connectivity.patch"; #Change connectivity check URLs to ours patch -p1 < "$patches/android_frameworks_base/0008-Disable_Analytics.patch"; #Disable/reduce functionality of various ad/analytics libraries diff --git a/Scripts/LineageOS-15.1/Patch.sh b/Scripts/LineageOS-15.1/Patch.sh index 6fb3d9cd..c795c05e 100755 --- a/Scripts/LineageOS-15.1/Patch.sh +++ b/Scripts/LineageOS-15.1/Patch.sh @@ -84,6 +84,7 @@ sed -i 's/com.android.messaging/org.smssecure.smssecure/' core/res/res/values/co sed -i 's|config_permissionReviewRequired">false|config_permissionReviewRequired">true|' core/res/res/values/config.xml; if [ "$MICROG_INCLUDED" = "FULL" ]; then patch -p1 < "$patches/android_frameworks_base/0002-Signature_Spoofing.patch"; fi; #Allow packages to spoof their signature (microG) if [ "$MICROG_INCLUDED" = "FULL" ]; then patch -p1 < "$patches/android_frameworks_base/0003-Harden_Sig_Spoofing.patch"; fi; #Restrict signature spoofing to system apps signed with the platform key +if [ "$MICROG_INCLUDED" = "NLP" ]; then patch -p1 < "$patchesCommon/android_frameworks_base/0001-UnifiedNLP_Support.patch"; fi; #Add UnifiedNLP to location providers changeDefaultDNS; #patch -p1 < "$patches/android_frameworks_base/0005-Connectivity.patch"; #Change connectivity check URLs to ours patch -p1 < "$patches/android_frameworks_base/0006-Disable_Analytics.patch"; #Disable/reduce functionality of various ad/analytics libraries diff --git a/Scripts/init.sh b/Scripts/init.sh index 3ea7b103..a0b7a5e3 100644 --- a/Scripts/init.sh +++ b/Scripts/init.sh @@ -88,7 +88,7 @@ source "$scripts/Functions.sh"; export LC_ALL=C; -unalias cp; -unalias mv; -unalias rm; -unalias ln; +unalias cp &>/dev/null || true; +unalias mv &>/dev/null || true; +unalias rm &>/dev/null || true; +unalias ln &>/dev/null || true; diff --git a/TODO b/TODO index 46ca314e..aee7f9e9 100644 --- a/TODO +++ b/TODO @@ -1,11 +1,11 @@ -Last updated: 2018-06-24 +Last updated: 2018-06-25 High Priority (Release blockers) Build - Automate incremental update generation - Switch HOSTS to release variant - New signing keys - - Consider removing microG or instead keeping UnifiedNLP + - Determine whether to ship microG or just UnifiedNLP Project - Create cryptocurrency addresses - Setup Stripe @@ -28,7 +28,7 @@ Medium Priority Design - Facelift of Extirpater - Facelift of Hypatia - - Various other branding (proper bootanimation, setupwizard, etc.) + - Various other branding (logo, snazzy bootanimation, setupwizard, etc.) Project - Create various XMPP conference rooms Servers