From 7a168302cfb14a516ec744daff31cfa11bc1d50f Mon Sep 17 00:00:00 2001
From: Tad <tad@spotco.us>
Date: Thu, 12 May 2022 23:17:43 -0400
Subject: [PATCH] 19.1: Location indicator exemptions

Credit/References:
https://gitlab.com/CalyxOS/vendor_calyx/-/commit/26ddac7988eb34a50f426cac8fd15da93519168a
https://gitlab.com/CalyxOS/vendor_calyx/-/commit/7370657f85038c8c64ce18d7a6e129e9f4cfe61c
https://gitlab.com/CalyxOS/vendor_calyx/-/commit/37e2a4e0bc7f1476545ab210e5717f09f5f47a97
https://github.com/GrapheneOS/platform_frameworks_base/commit/a5d43c015790e63d94ec252ce9cd2579903a39f2
https://github.com/GrapheneOS/platform_frameworks_base/commit/ac60a2117e6919548d27617747bd44f9ee85a61e

Signed-off-by: Tad <tad@spotco.us>
---
 .../base/core/res/res/values/config.xml       | 14 +++++++++++
 .../0020-Location_Indicators-2.patch          | 24 -------------------
 ...1.patch => 0020-Location_Indicators.patch} |  0
 Scripts/LineageOS-19.1/Patch.sh               |  3 +--
 4 files changed, 15 insertions(+), 26 deletions(-)
 delete mode 100644 Patches/LineageOS-19.1/android_frameworks_base/0020-Location_Indicators-2.patch
 rename Patches/LineageOS-19.1/android_frameworks_base/{0020-Location_Indicators-1.patch => 0020-Location_Indicators.patch} (100%)

diff --git a/Patches/Common/android_vendor_divested/overlay/common/frameworks/base/core/res/res/values/config.xml b/Patches/Common/android_vendor_divested/overlay/common/frameworks/base/core/res/res/values/config.xml
index c03bf845..314050e7 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/frameworks/base/core/res/res/values/config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/frameworks/base/core/res/res/values/config.xml
@@ -232,4 +232,18 @@
     <!-- Flag indicating whether we should enable smart battery. -->
     <bool name="config_smart_battery_available">true</bool>
 
+    <!-- Packages to be excluded from location indicators -->
+    <string-array name="config_locationExtraPackageNames" translatable="false">
+        <!-- Bluetooth -->
+        <item>com.android.bluetooth</item>
+        <!-- Phone Services -->
+        <item>com.android.phone</item>
+        <!-- ImsService on raviole -->
+        <item>com.shannon.imsservice</item>
+        <!-- DejaVuLocationService -->
+        <item>org.fitchfamily.android.dejavu</item>
+        <!-- MozillaNlpBackend -->
+        <item>org.microg.nlp.backend.ichnaea</item>
+    </string-array>
+
 </resources>
diff --git a/Patches/LineageOS-19.1/android_frameworks_base/0020-Location_Indicators-2.patch b/Patches/LineageOS-19.1/android_frameworks_base/0020-Location_Indicators-2.patch
deleted file mode 100644
index 12d8f8a1..00000000
--- a/Patches/LineageOS-19.1/android_frameworks_base/0020-Location_Indicators-2.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: flawedworld <flawedworld@flawed.world>
-Date: Fri, 25 Feb 2022 01:02:26 +0000
-Subject: [PATCH] Exclude Bluetooth app from Location indicators
-
----
- core/res/res/values/config.xml | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
-index 7305ccc93e93..5114704eac33 100644
---- a/core/res/res/values/config.xml
-+++ b/core/res/res/values/config.xml
-@@ -1753,7 +1753,9 @@
-          set before. -->
-     <bool name="config_defaultAdasGnssLocationEnabled" translatable="false">false</bool>
- 
--    <string-array name="config_locationExtraPackageNames" translatable="false"></string-array>
-+    <string-array name="config_locationExtraPackageNames" translatable="false">
-+     <item>com.android.bluetooth</item>
-+    </string-array>
- 
-     <!-- The package name of the default network recommendation app.
-          A network recommendation provider must:
diff --git a/Patches/LineageOS-19.1/android_frameworks_base/0020-Location_Indicators-1.patch b/Patches/LineageOS-19.1/android_frameworks_base/0020-Location_Indicators.patch
similarity index 100%
rename from Patches/LineageOS-19.1/android_frameworks_base/0020-Location_Indicators-1.patch
rename to Patches/LineageOS-19.1/android_frameworks_base/0020-Location_Indicators.patch
diff --git a/Scripts/LineageOS-19.1/Patch.sh b/Scripts/LineageOS-19.1/Patch.sh
index 76420d2a..a5c41eb5 100644
--- a/Scripts/LineageOS-19.1/Patch.sh
+++ b/Scripts/LineageOS-19.1/Patch.sh
@@ -158,8 +158,7 @@ applyPatch "$DOS_PATCHES/android_frameworks_base/0018-Exec_Based_Spawning-11.pat
 applyPatch "$DOS_PATCHES/android_frameworks_base/0018-Exec_Based_Spawning-12.patch";
 sed -i 's/sys.spawn.exec/persist.security.exec_spawn_new/' core/java/com/android/internal/os/ZygoteConnection.java;
 fi;
-applyPatch "$DOS_PATCHES/android_frameworks_base/0020-Location_Indicators-1.patch"; #SystemUI: Use new privacy indicators for location (GrapheneOS)
-applyPatch "$DOS_PATCHES/android_frameworks_base/0020-Location_Indicators-2.patch"; #Exclude Bluetooth app from Location indicators (GrapheneOS)
+applyPatch "$DOS_PATCHES/android_frameworks_base/0020-Location_Indicators.patch"; #SystemUI: Use new privacy indicators for location (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_frameworks_base/0021-Boot_Animation.patch"; #Use basic boot animation (DivestOS)
 applyPatch "$DOS_PATCHES_COMMON/android_frameworks_base/0007-ABI_Warning.patch"; #Warn when running activity from 32 bit app on ARM64 devices. (AOSP)
 applyPatch "$DOS_PATCHES/android_frameworks_base/326692.patch"; #Skip screen on animation when wake and unlock via biometrics (jesec)