180 lines
7.4 KiB
Diff
180 lines
7.4 KiB
Diff
From 0023b05341d4554d9b78d6c436d4543aa41c3a91 Mon Sep 17 00:00:00 2001
|
|
From: harvey186 <harvey186@hotmail.com>
|
|
Date: Fri, 15 Dec 2023 11:05:50 +0100
|
|
Subject: [PATCH] hosts_toggle
|
|
|
|
Change-Id: I604f7f8e4144b676ff5b8163e6e00a993ee6d338
|
|
---
|
|
res/values/strings.xml | 3 +
|
|
res/xml/security_dashboard_settings.xml | 8 +-
|
|
.../security/HostsPreferenceController.java | 106 ++++++++++++++++++
|
|
.../settings/security/SecuritySettings.java | 1 +
|
|
4 files changed, 117 insertions(+), 1 deletion(-)
|
|
create mode 100644 src/com/android/settings/security/HostsPreferenceController.java
|
|
|
|
diff --git a/res/values/strings.xml b/res/values/strings.xml
|
|
index 11a921848d..0d34052266 100644
|
|
--- a/res/values/strings.xml
|
|
+++ b/res/values/strings.xml
|
|
@@ -620,6 +620,9 @@
|
|
<string name="security_enable_widgets_title">Enable widgets</string>
|
|
<!-- Summary for settings checkbox to disable widgets when the setting has been disabled by an installed device admin [CHAR LIMIT=50] -->
|
|
<string name="security_enable_widgets_disabled_summary">Disabled by admin</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>
|
|
+
|
|
<!-- 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>
|
|
<!-- Text shown for the description of the lock when trust lost option [CHAR LIMIT=NONE -->
|
|
diff --git a/res/xml/security_dashboard_settings.xml b/res/xml/security_dashboard_settings.xml
|
|
index 0550441d3f..475c398ac0 100644
|
|
--- a/res/xml/security_dashboard_settings.xml
|
|
+++ b/res/xml/security_dashboard_settings.xml
|
|
@@ -60,6 +60,12 @@
|
|
android:title="@string/security_settings_biometric_preference_title"
|
|
android:summary="@string/summary_placeholder"
|
|
settings:keywords="@string/keywords_biometric_settings" />
|
|
+
|
|
+ <SwitchPreference
|
|
+ android:key="hosts_disable"
|
|
+ android:title="@string/hosts_disable_title"
|
|
+ android:summary="@string/hosts_disable_summary"
|
|
+ android:persistent="false" />
|
|
</PreferenceCategory>
|
|
|
|
<Preference
|
|
@@ -71,4 +77,4 @@
|
|
settings:controller="com.android.settings.security.SecurityAdvancedSettingsController"
|
|
settings:keywords="@string/security_advanced_settings_keywords" />
|
|
|
|
-</PreferenceScreen>
|
|
\ No newline at end of file
|
|
+</PreferenceScreen>
|
|
diff --git a/src/com/android/settings/security/HostsPreferenceController.java b/src/com/android/settings/security/HostsPreferenceController.java
|
|
new file mode 100644
|
|
index 0000000000..d8af6d2649
|
|
--- /dev/null
|
|
+++ b/src/com/android/settings/security/HostsPreferenceController.java
|
|
@@ -0,0 +1,106 @@
|
|
+/*
|
|
+ * Copyright (C) 2022 The Android Open Source Project
|
|
+ *
|
|
+ * Licensed under the Apache License, Version 2.0 (the "License");
|
|
+ * you may not use this file except in compliance with the License.
|
|
+ * You may obtain a copy of the License at
|
|
+ *
|
|
+ * http://www.apache.org/licenses/LICENSE-2.0
|
|
+ *
|
|
+ * Unless required by applicable law or agreed to in writing, software
|
|
+ * distributed under the License is distributed on an "AS IS" BASIS,
|
|
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
+ * See the License for the specific language governing permissions and
|
|
+ * limitations under the License
|
|
+ */
|
|
+
|
|
+package com.android.settings.security;
|
|
+
|
|
+import android.content.Context;
|
|
+
|
|
+import android.os.UserHandle;
|
|
+import android.os.UserManager;
|
|
+import android.os.SystemProperties;
|
|
+
|
|
+import android.provider.Settings;
|
|
+
|
|
+import androidx.preference.Preference;
|
|
+import androidx.preference.PreferenceCategory;
|
|
+import androidx.preference.PreferenceGroup;
|
|
+import androidx.preference.PreferenceScreen;
|
|
+import androidx.preference.TwoStatePreference;
|
|
+import androidx.preference.SwitchPreference;
|
|
+
|
|
+import com.android.internal.widget.LockPatternUtils;
|
|
+import com.android.settings.core.PreferenceControllerMixin;
|
|
+import com.android.settingslib.core.AbstractPreferenceController;
|
|
+import com.android.settingslib.core.lifecycle.events.OnResume;
|
|
+
|
|
+public class HostsPreferenceController extends AbstractPreferenceController
|
|
+ implements PreferenceControllerMixin, OnResume, Preference.OnPreferenceChangeListener {
|
|
+
|
|
+ private static final String SYS_KEY_HOSTS_DISABLE = "persist.security.hosts_disable";
|
|
+ private static final String PREF_KEY_HOSTS_DISABLE = "hosts_disable";
|
|
+ private static final String PREF_KEY_SECURITY_CATEGORY = "security_category";
|
|
+
|
|
+ private PreferenceCategory mSecurityCategory;
|
|
+ private SwitchPreference mHostsDisable;
|
|
+ private boolean mIsAdmin;
|
|
+ private UserManager mUm;
|
|
+
|
|
+ public HostsPreferenceController(Context context) {
|
|
+ super(context);
|
|
+ mUm = UserManager.get(context);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void displayPreference(PreferenceScreen screen) {
|
|
+ super.displayPreference(screen);
|
|
+ mSecurityCategory = screen.findPreference(PREF_KEY_SECURITY_CATEGORY);
|
|
+ updatePreferenceState();
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public boolean isAvailable() {
|
|
+ mIsAdmin = mUm.isAdminUser();
|
|
+ return mIsAdmin;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public String getPreferenceKey() {
|
|
+ return PREF_KEY_HOSTS_DISABLE;
|
|
+ }
|
|
+
|
|
+ // TODO: should we use onCreatePreferences() instead?
|
|
+ private void updatePreferenceState() {
|
|
+ if (mSecurityCategory == null) {
|
|
+ return;
|
|
+ }
|
|
+
|
|
+ if (mIsAdmin) {
|
|
+ mHostsDisable = (SwitchPreference) mSecurityCategory.findPreference(PREF_KEY_HOSTS_DISABLE);
|
|
+ mHostsDisable.setChecked(SystemProperties.getInt(SYS_KEY_HOSTS_DISABLE, 0) == 1);
|
|
+ } else {
|
|
+ mSecurityCategory.removePreference(mSecurityCategory.findPreference(PREF_KEY_HOSTS_DISABLE));
|
|
+ }
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void onResume() {
|
|
+ updatePreferenceState();
|
|
+ if (mHostsDisable != null) {
|
|
+ boolean mode = mHostsDisable.isChecked();
|
|
+ SystemProperties.set(SYS_KEY_HOSTS_DISABLE, mode ? "1" : "0");
|
|
+ }
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public boolean onPreferenceChange(Preference preference, Object value) {
|
|
+ final String key = preference.getKey();
|
|
+ if (PREF_KEY_HOSTS_DISABLE.equals(key)) {
|
|
+ final boolean mode = !mHostsDisable.isChecked();
|
|
+ SystemProperties.set(SYS_KEY_HOSTS_DISABLE, mode ? "1" : "0");
|
|
+ }
|
|
+ return true;
|
|
+ }
|
|
+}
|
|
diff --git a/src/com/android/settings/security/SecuritySettings.java b/src/com/android/settings/security/SecuritySettings.java
|
|
index b30b54d4d4..62eeaefd57 100644
|
|
--- a/src/com/android/settings/security/SecuritySettings.java
|
|
+++ b/src/com/android/settings/security/SecuritySettings.java
|
|
@@ -105,6 +105,7 @@ public class SecuritySettings extends DashboardFragment {
|
|
securityPreferenceControllers.add(new CombinedBiometricStatusPreferenceController(
|
|
context, lifecycle));
|
|
securityPreferenceControllers.add(new ChangeScreenLockPreferenceController(context, host));
|
|
+ securityPreferenceControllers.add(new HostsPreferenceController(context));
|
|
controllers.add(new PreferenceCategoryController(context, SECURITY_CATEGORY)
|
|
.setChildren(securityPreferenceControllers));
|
|
controllers.addAll(securityPreferenceControllers);
|
|
--
|
|
2.34.1
|
|
|