Merge branch 'master' of github.com:microg/android_packages_apps_GmsCore

This commit is contained in:
Marvin W 2017-02-12 18:29:29 +01:00
commit 11abea3eb0
No known key found for this signature in database
GPG Key ID: 072E9235DB996F2A
2 changed files with 163 additions and 145 deletions

View File

@ -21,7 +21,7 @@ LOCAL_PACKAGE_NAME := GmsCore
gmscore_root := $(LOCAL_PATH) gmscore_root := $(LOCAL_PATH)
gmscore_dir := play-services-core gmscore_dir := play-services-core
gmscore_out := $(OUT_DIR)/target/common/obj/APPS/$(LOCAL_MODULE)_intermediates gmscore_out := $(TARGET_COMMON_OUT_ROOT)/obj/APPS/$(LOCAL_MODULE)_intermediates
gmscore_build := $(gmscore_root)/$(gmscore_dir)/build gmscore_build := $(gmscore_root)/$(gmscore_dir)/build
gmscore_apk := build/outputs/apk/play-services-core-release-unsigned.apk gmscore_apk := build/outputs/apk/play-services-core-release-unsigned.apk

View File

@ -141,4 +141,22 @@
<string name="network_type_wifi">Wi-Fi</string> <string name="network_type_wifi">Wi-Fi</string>
<string name="network_type_roaming">漫遊</string> <string name="network_type_roaming">漫遊</string>
<string name="network_type_other">其他網路</string> <string name="network_type_other">其他網路</string>
<string name="snet_intro">Google SafetyNet是一個確認手機被確實保護和相容於Android CTS的驗證系統。一些程式基於安全因素使用SafetyNet一些則是以必須通過的形式來防止篡改。
microG GmsCore包含了SafetyNet的自由執行但官方伺服器需要SafetyNet請求經非自由軟體性質的DroidGuard系統簽名。有一個可用的沙盒測試版本DroidGuard獨立程式“DroidGuard Helper”。</string>
<string name="prefcat_configuration">設定</string>
<string name="pref_snet_status_disabled_title">停用</string>
<string name="pref_snet_status_disabled_summary">徹底停用SafetyNet</string>
<string name="pref_snet_status_official_title">使用官方伺服器</string>
<string name="pref_snet_status_official_summary">需要未root的系統及安裝microG DroidGuard Helper</string>
<string name="pref_snet_status_third_party_title">使用第三方伺服器</string>
<string name="pref_snet_status_third_party_summary">第三方伺服器可能不需要DroidGuard簽名便能回應SafetyNet請求</string>
<string name="pref_snet_custom_url_title">自訂伺服器網址</string>
<string name="pref_snet_custom_url_summary">回應SafetyNet驗證請求之第三方伺服器的完整網址</string>
<string name="prefcat_test">測試</string>
<string name="pref_snet_testdrive_title">測試SafetyNet驗證</string>
</resources> </resources>