Signed-off-by: Tad <tad@spotco.us>
This commit is contained in:
Tad 2023-06-07 15:32:53 -04:00
parent f31b5f6ac9
commit ffe020a7a0
No known key found for this signature in database
GPG key ID: B286E9F57A07424B
9 changed files with 13 additions and 13 deletions

View file

@ -20,7 +20,7 @@ index a64940d793..f1ea003e3b 100644
<string name="bluetooth_connect_access_dialog_positive">Connect</string> <string name="bluetooth_connect_access_dialog_positive">Connect</string>
+ +
+ <string name="force_disable_supl_title">Force disable Secure User Plane Location (SUPL)</string> + <string name="force_disable_supl_title">Force disable Secure User Plane Location (SUPL)</string>
+ <string name="force_disable_supl_summary">Always disable SUPL assisted location support regardless of carrier configuration (does not disable control plane A-GNSS and DivestOS does not send IMSI to the SUPL)</string> + <string name="force_disable_supl_summary">Always disable SUPL assisted location support regardless of carrier configuration or emergency call status (does not disable control plane A-GNSS and DivestOS does not send IMSI to the SUPL)</string>
</resources> </resources>
diff --git a/res/xml/location_settings.xml b/res/xml/location_settings.xml diff --git a/res/xml/location_settings.xml b/res/xml/location_settings.xml
index 136e6ab619..ae1a0e0f3e 100644 index 136e6ab619..ae1a0e0f3e 100644

View file

@ -20,7 +20,7 @@ index 060f94a48f..2e6e2fc8b2 100644
<string name="connectivity_check_summary">HTTP endpoints to use for performing internet connectivity checks.</string> <string name="connectivity_check_summary">HTTP endpoints to use for performing internet connectivity checks.</string>
+ +
+ <string name="force_disable_supl_title">Force disable Secure User Plane Location (SUPL)</string> + <string name="force_disable_supl_title">Force disable Secure User Plane Location (SUPL)</string>
+ <string name="force_disable_supl_summary">Always disable SUPL assisted location support regardless of carrier configuration (does not disable control plane A-GNSS and DivestOS does not send IMSI to the SUPL)</string> + <string name="force_disable_supl_summary">Always disable SUPL assisted location support regardless of carrier configuration or emergency call status (does not disable control plane A-GNSS and DivestOS does not send IMSI to the SUPL)</string>
</resources> </resources>
diff --git a/res/xml/location_settings.xml b/res/xml/location_settings.xml diff --git a/res/xml/location_settings.xml b/res/xml/location_settings.xml
index fb03f4c7f3..a66df8fea6 100644 index fb03f4c7f3..a66df8fea6 100644

View file

@ -20,7 +20,7 @@ index 3d44ae6ca6..b970538e6e 100644
<string name="connectivity_check_summary">HTTP endpoints to use for performing internet connectivity checks.</string> <string name="connectivity_check_summary">HTTP endpoints to use for performing internet connectivity checks.</string>
+ +
+ <string name="force_disable_supl_title">Force disable Secure User Plane Location (SUPL)</string> + <string name="force_disable_supl_title">Force disable Secure User Plane Location (SUPL)</string>
+ <string name="force_disable_supl_summary">Always disable SUPL assisted location support regardless of carrier configuration (does not disable control plane A-GNSS and DivestOS does not send IMSI to the SUPL)</string> + <string name="force_disable_supl_summary">Always disable SUPL assisted location support regardless of carrier configuration or emergency call status (does not disable control plane A-GNSS and DivestOS does not send IMSI to the SUPL)</string>
</resources> </resources>
diff --git a/res/xml/location_settings.xml b/res/xml/location_settings.xml diff --git a/res/xml/location_settings.xml b/res/xml/location_settings.xml
index fe87efd73d..74502a7d58 100644 index fe87efd73d..74502a7d58 100644

View file

@ -9,10 +9,10 @@ Change-Id: I5ccc4d61e52ac11ef33f44618d0e610089885b87
1 file changed, 6 insertions(+), 1 deletion(-) 1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/services/core/java/com/android/server/location/gnss/GnssLocationProvider.java b/services/core/java/com/android/server/location/gnss/GnssLocationProvider.java diff --git a/services/core/java/com/android/server/location/gnss/GnssLocationProvider.java b/services/core/java/com/android/server/location/gnss/GnssLocationProvider.java
index a6a3db11b729..6ddd57c1ff11 100644 index 389cbe20dbd3..b3a81f597db1 100644
--- a/services/core/java/com/android/server/location/gnss/GnssLocationProvider.java --- a/services/core/java/com/android/server/location/gnss/GnssLocationProvider.java
+++ b/services/core/java/com/android/server/location/gnss/GnssLocationProvider.java +++ b/services/core/java/com/android/server/location/gnss/GnssLocationProvider.java
@@ -1721,6 +1721,11 @@ public class GnssLocationProvider extends AbstractLocationProvider implements @@ -1722,6 +1722,11 @@ public class GnssLocationProvider extends AbstractLocationProvider implements
int type = AGPS_SETID_TYPE_NONE; int type = AGPS_SETID_TYPE_NONE;
String setId = null; String setId = null;
@ -24,7 +24,7 @@ index a6a3db11b729..6ddd57c1ff11 100644
int subId = SubscriptionManager.getDefaultDataSubscriptionId(); int subId = SubscriptionManager.getDefaultDataSubscriptionId();
if (mNIHandler.getInEmergency() && mNetworkConnectivityHandler.getActiveSubId() >= 0) { if (mNIHandler.getInEmergency() && mNetworkConnectivityHandler.getActiveSubId() >= 0) {
subId = mNetworkConnectivityHandler.getActiveSubId(); subId = mNetworkConnectivityHandler.getActiveSubId();
@@ -1740,7 +1745,7 @@ public class GnssLocationProvider extends AbstractLocationProvider implements @@ -1741,7 +1746,7 @@ public class GnssLocationProvider extends AbstractLocationProvider implements
// This means the framework has the SIM card. // This means the framework has the SIM card.
type = AGPS_SETID_TYPE_MSISDN; type = AGPS_SETID_TYPE_MSISDN;
} }

View file

@ -75,7 +75,7 @@ index 1435016fc55a..db8131729555 100644
+ } + }
} }
diff --git a/services/core/java/com/android/server/location/gnss/GnssLocationProvider.java b/services/core/java/com/android/server/location/gnss/GnssLocationProvider.java diff --git a/services/core/java/com/android/server/location/gnss/GnssLocationProvider.java b/services/core/java/com/android/server/location/gnss/GnssLocationProvider.java
index 6ddd57c1ff11..2ccdb9e14507 100644 index b3a81f597db1..97dda44b1c97 100644
--- a/services/core/java/com/android/server/location/gnss/GnssLocationProvider.java --- a/services/core/java/com/android/server/location/gnss/GnssLocationProvider.java
+++ b/services/core/java/com/android/server/location/gnss/GnssLocationProvider.java +++ b/services/core/java/com/android/server/location/gnss/GnssLocationProvider.java
@@ -100,6 +100,7 @@ import android.telephony.TelephonyManager; @@ -100,6 +100,7 @@ import android.telephony.TelephonyManager;

View file

@ -13,7 +13,7 @@ Change-Id: Ie3990a6e789be22da0c7771d85ad71034ed334eb
1 file changed, 61 insertions(+) 1 file changed, 61 insertions(+)
diff --git a/packages/LineageSettingsProvider/src/org/lineageos/lineagesettings/LineageDatabaseHelper.java b/packages/LineageSettingsProvider/src/org/lineageos/lineagesettings/LineageDatabaseHelper.java diff --git a/packages/LineageSettingsProvider/src/org/lineageos/lineagesettings/LineageDatabaseHelper.java b/packages/LineageSettingsProvider/src/org/lineageos/lineagesettings/LineageDatabaseHelper.java
index 6bde4192..f0ece387 100644 index 6bde4192..b97a0c80 100644
--- a/packages/LineageSettingsProvider/src/org/lineageos/lineagesettings/LineageDatabaseHelper.java --- a/packages/LineageSettingsProvider/src/org/lineageos/lineagesettings/LineageDatabaseHelper.java
+++ b/packages/LineageSettingsProvider/src/org/lineageos/lineagesettings/LineageDatabaseHelper.java +++ b/packages/LineageSettingsProvider/src/org/lineageos/lineagesettings/LineageDatabaseHelper.java
@@ -162,6 +162,66 @@ public class LineageDatabaseHelper extends SQLiteOpenHelper{ @@ -162,6 +162,66 @@ public class LineageDatabaseHelper extends SQLiteOpenHelper{

View file

@ -85,7 +85,7 @@ index 12e29e693b..feaaabac3d 100644
android:id="@+id/private_dns_mode_opportunistic" android:id="@+id/private_dns_mode_opportunistic"
layout="@layout/preference_widget_dialog_radiobutton"/> layout="@layout/preference_widget_dialog_radiobutton"/>
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index e78fa63658..809b07744a 100644 index d9ca157167..38ac11f64e 100644
--- a/res/values/cm_strings.xml --- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml +++ b/res/values/cm_strings.xml
@@ -15,6 +15,49 @@ @@ -15,6 +15,49 @@

View file

@ -19,13 +19,13 @@ index e68a5595ab..553038c2b4 100644
<string name="connectivity_check_summary">HTTP endpoints to use for performing internet connectivity checks.</string> <string name="connectivity_check_summary">HTTP endpoints to use for performing internet connectivity checks.</string>
+ <string name="force_disable_supl_title">Force disable Secure User Plane Location (SUPL)</string> + <string name="force_disable_supl_title">Force disable Secure User Plane Location (SUPL)</string>
+ <string name="force_disable_supl_summary">Always disable SUPL assisted location support regardless of carrier configuration (does not disable control plane A-GNSS and DivestOS does not send IMSI to the SUPL)</string> + <string name="force_disable_supl_summary">Always disable SUPL assisted location support regardless of carrier configuration or emergency call status (does not disable control plane A-GNSS and DivestOS does not send IMSI to the SUPL)</string>
</resources> </resources>
diff --git a/res/xml/location_settings.xml b/res/xml/location_settings.xml diff --git a/res/xml/location_settings.xml b/res/xml/location_settings.xml
index fe87efd73d..74502a7d58 100644 index 477bbe205d..82ead9887d 100644
--- a/res/xml/location_settings.xml --- a/res/xml/location_settings.xml
+++ b/res/xml/location_settings.xml +++ b/res/xml/location_settings.xml
@@ -66,6 +66,13 @@ @@ -72,6 +72,13 @@
android:title="@string/location_services_preference_title" android:title="@string/location_services_preference_title"
settings:controller="com.android.settings.location.LocationServicesPreferenceController"/> settings:controller="com.android.settings.location.LocationServicesPreferenceController"/>

View file

@ -165,7 +165,7 @@ index 9d1055c..d0c3aca 100644
if (mSupportsKeyDisabler) { if (mSupportsKeyDisabler) {
final Bundle myPageBundle = mSetupWizardApp.getSettingsBundle(); final Bundle myPageBundle = mSetupWizardApp.getSettingsBundle();
diff --git a/src/org/lineageos/setupwizard/SetupWizardApp.java b/src/org/lineageos/setupwizard/SetupWizardApp.java diff --git a/src/org/lineageos/setupwizard/SetupWizardApp.java b/src/org/lineageos/setupwizard/SetupWizardApp.java
index dcfe3bc..9466815 100644 index 51d65af..577a3e0 100644
--- a/src/org/lineageos/setupwizard/SetupWizardApp.java --- a/src/org/lineageos/setupwizard/SetupWizardApp.java
+++ b/src/org/lineageos/setupwizard/SetupWizardApp.java +++ b/src/org/lineageos/setupwizard/SetupWizardApp.java
@@ -60,7 +60,6 @@ public class SetupWizardApp extends Application { @@ -60,7 +60,6 @@ public class SetupWizardApp extends Application {