From a7182faac1a06d7b337169448f364e43c1955778 Mon Sep 17 00:00:00 2001 From: harvey186 Date: Fri, 12 Jan 2024 15:24:41 +0100 Subject: [PATCH] hosts-toggle Change-Id: I10ff19e69b03662a8c7f0d75e3769aabfcf2d585 --- 0000-hosts_toggle.patch | 15 +-- res/values/strings.xml | 3 + res/xml/security_dashboard_settings.xml | 8 +- .../security/HostsPreferenceController.java | 106 ++++++++++++++++++ .../settings/security/SecuritySettings.java | 1 + 5 files changed, 118 insertions(+), 15 deletions(-) create mode 100644 src/com/android/settings/security/HostsPreferenceController.java diff --git a/res/values/strings.xml b/res/values/strings.xml index e7695a8b64..1951c0a06b 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -705,6 +705,9 @@ Enable widgets Disabled by admin + + Disable DNS content blocker + Disables use of the included /etc/hosts database for data collection and malware blocking. Lock screen when trust is lost 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" /> + + - \ No newline at end of file + 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