Fixup previous commits

Patches/Common/android_frameworks_base/0001-UnifiedNLP_Support.patch

@@ -0,0 +1,26 @@
+From aff27a258e5585172781d4ba128294ffc7e84b82 Mon Sep 17 00:00:00 2001
+From: Tad <tad@spotco.us>
+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 @@
+     <string-array name="config_locationProviderPackageNames" translatable="false">
+         <!-- The standard AOSP fused location provider -->
+         <item>com.android.location.fused</item>
++        <!-- UnifiedNLP Location Provider -->
++	<item>org.microg.nlp</item>
+     </string-array>
+ 
+     <!-- This string array can be overriden to enable test location providers initially. -->
+-- 
+2.18.0
+

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

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

Scripts/init.sh

@@ -88,7 +88,7 @@ source "$scripts/Functions.sh";
 
 export LC_ALL=C;
 
-unalias cp;
+unalias cp &>/dev/null || true;
-unalias mv;
+unalias mv &>/dev/null || true;
-unalias rm;
+unalias rm &>/dev/null || true;
-unalias ln;
+unalias ln &>/dev/null || true;

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