Adjust microg config path

/product can't be used for now
https://github.com/microg/GmsCore/issues/1976

also move the wording around so it can be easier to remove later
after a new release is tagged

Signed-off-by: Tad <tad@spotco.us>
This commit is contained in:
Tad 2023-07-07 13:33:11 -04:00
parent 492ed24ca2
commit 5bc210f135
No known key found for this signature in database
GPG Key ID: B286E9F57A07424B
5 changed files with 11 additions and 11 deletions

View File

@ -23,9 +23,9 @@ include $(CLEAR_VARS)
LOCAL_MODULE := microg.xml LOCAL_MODULE := microg.xml
LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_CLASS := ETC
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT_ETC) LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)
LOCAL_SRC_FILES := $(LOCAL_MODULE) LOCAL_SRC_FILES := $(LOCAL_MODULE)
LOCAL_PRODUCT_MODULE := true LOCAL_PRODUCT_MODULE := false
include $(BUILD_PREBUILT) include $(BUILD_PREBUILT)

View File

@ -23,8 +23,8 @@ index a5aab8e5d0..eb346bd8eb 100644
<string name="hosts_disable_title">Disable DNS content blocker</string> <string name="hosts_disable_title">Disable DNS content blocker</string>
<string name="hosts_disable_summary">Disables use of the included /etc/hosts database for data collection and malware blocking.</string> <string name="hosts_disable_summary">Disables use of the included /etc/hosts database for data collection and malware blocking.</string>
+ <string name="sig_spoof_title">microG enablement (not recommended)</string> + <string name="sig_spoof_title">microG enablement</string>
+ <string name="sig_spoof_summary">Allows official builds of microG apps to spoof the Google signature. Not supported, not recommended. May break apps and/or degrade their security model. Notes: 1) microG connects directly to Google, 2) microG can download/execute proprietary code from Google, 3) apps talking to microG do so using proprietary Google libraries.</string> + <string name="sig_spoof_summary">Allows official builds of microG apps to spoof the Google signature. Not supported, not recommended. May break apps and/or degrade their security model. Notes: 1) microG connects directly to Google, 2) apps talking to microG do so using proprietary Google libraries, 3) microG can download/execute proprietary code from Google.</string>
+ +
<!-- Title for the top level Privacy Settings [CHAR LIMIT=30]--> <!-- Title for the top level Privacy Settings [CHAR LIMIT=30]-->
<string name="privacy_dashboard_title">Privacy</string> <string name="privacy_dashboard_title">Privacy</string>

View File

@ -23,8 +23,8 @@ index c597570f35..f04d49d6f1 100644
<string name="hosts_disable_title">Disable DNS content blocker</string> <string name="hosts_disable_title">Disable DNS content blocker</string>
<string name="hosts_disable_summary">Disables use of the included /etc/hosts database for data collection and malware blocking.</string> <string name="hosts_disable_summary">Disables use of the included /etc/hosts database for data collection and malware blocking.</string>
+ <string name="sig_spoof_title">microG enablement (not recommended)</string> + <string name="sig_spoof_title">microG enablement</string>
+ <string name="sig_spoof_summary">Allows official builds of microG apps to spoof the Google signature. Not supported, not recommended. May break apps and/or degrade their security model. Notes: 1) microG connects directly to Google, 2) microG can download/execute proprietary code from Google, 3) apps talking to microG do so using proprietary Google libraries.</string> + <string name="sig_spoof_summary">Allows official builds of microG apps to spoof the Google signature. Not supported, not recommended. May break apps and/or degrade their security model. Notes: 1) microG connects directly to Google, 2) apps talking to microG do so using proprietary Google libraries, 3) microG can download/execute proprietary code from Google.</string>
+ +
<!-- Title for the top level Privacy Settings [CHAR LIMIT=30]--> <!-- Title for the top level Privacy Settings [CHAR LIMIT=30]-->
<string name="privacy_dashboard_title">Privacy</string> <string name="privacy_dashboard_title">Privacy</string>

View File

@ -23,8 +23,8 @@ index 1be8ea0677..24b8cbe581 100644
<string name="hosts_disable_title">Disable DNS content blocker</string> <string name="hosts_disable_title">Disable DNS content blocker</string>
<string name="hosts_disable_summary">Disables use of the included /etc/hosts database for data collection and malware blocking.</string> <string name="hosts_disable_summary">Disables use of the included /etc/hosts database for data collection and malware blocking.</string>
+ <string name="sig_spoof_title">microG enablement (not recommended)</string> + <string name="sig_spoof_title">microG enablement</string>
+ <string name="sig_spoof_summary">Allows official builds of microG apps to spoof the Google signature. Not supported, not recommended. May break apps and/or degrade their security model. Notes: 1) microG connects directly to Google, 2) microG can download/execute proprietary code from Google, 3) apps talking to microG do so using proprietary Google libraries.</string> + <string name="sig_spoof_summary">Allows official builds of microG apps to spoof the Google signature. Not supported, not recommended. May break apps and/or degrade their security model. Notes: 1) microG connects directly to Google, 2) apps talking to microG do so using proprietary Google libraries, 3) microG can download/execute proprietary code from Google.</string>
+ +
<!-- Title for the top level Privacy Settings [CHAR LIMIT=30]--> <!-- Title for the top level Privacy Settings [CHAR LIMIT=30]-->
<string name="privacy_dashboard_title">Privacy</string> <string name="privacy_dashboard_title">Privacy</string>

View File

@ -16,15 +16,15 @@ Signed-off-by: Tad <tad@spotco.us>
create mode 100644 src/com/android/settings/security/SigSpoofPreferenceController.java create mode 100644 src/com/android/settings/security/SigSpoofPreferenceController.java
diff --git a/res/values/strings.xml b/res/values/strings.xml diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6e619cc2c4..8bc598e4bd 100644 index 6e619cc2c4..15247c1c93 100644
--- a/res/values/strings.xml --- a/res/values/strings.xml
+++ b/res/values/strings.xml +++ b/res/values/strings.xml
@@ -756,6 +756,9 @@ @@ -756,6 +756,9 @@
<string name="hosts_disable_title">Disable DNS content blocker</string> <string name="hosts_disable_title">Disable DNS content blocker</string>
<string name="hosts_disable_summary">Disables use of the included /etc/hosts database for data collection and malware blocking.</string> <string name="hosts_disable_summary">Disables use of the included /etc/hosts database for data collection and malware blocking.</string>
+ <string name="sig_spoof_title">microG enablement (not recommended)</string> + <string name="sig_spoof_title">microG enablement</string>
+ <string name="sig_spoof_summary">Allows official builds of microG apps to spoof the Google signature. Not supported, not recommended. May break apps and/or degrade their security model. Notes: 1) microG connects directly to Google, 2) microG can download/execute proprietary code from Google, 3) apps talking to microG do so using proprietary Google libraries.</string> + <string name="sig_spoof_summary">Allows official builds of microG apps to spoof the Google signature. Not supported, not recommended. May break apps and/or degrade their security model. Notes: 1) microG connects directly to Google, 2) apps talking to microG do so using proprietary Google libraries, 3) microG can download/execute proprietary code from Google.</string>
+ +
<!-- Text shown for the title of the lock when trust lost option [CHAR LIMIT=40] --> <!-- Text shown for the title of the lock when trust lost option [CHAR LIMIT=40] -->
<string name="trust_lost_locks_screen_title">Lock screen when trust is lost</string> <string name="trust_lost_locks_screen_title">Lock screen when trust is lost</string>