From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: pratyush Date: Mon, 7 Jun 2021 22:15:59 +0100 Subject: [PATCH] add auto-reboot setting --- res/values/arrays.xml | 31 +++++++ res/values/strings.xml | 3 + res/xml/security_dashboard_settings.xml | 10 ++- .../AutoRebootPreferenceController.java | 82 +++++++++++++++++++ .../settings/security/SecuritySettings.java | 1 + 5 files changed, 126 insertions(+), 1 deletion(-) create mode 100644 src/com/android/settings/security/AutoRebootPreferenceController.java diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 617548cadc..9caf926229 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -146,6 +146,37 @@ 1800000 + + + Off + 10 minutes + 30 minutes + 1 hour + 2 hours + 4 hours + 8 hours + 12 hours + 24 hours + 36 hours + 48 hours + 72 hours + + + + 0 + 600000 + 1800000 + 3600000 + 7200000 + 14400000 + 28800000 + 43200000 + 86400000 + 129600000 + 172800000 + 259200000 + + Small Default diff --git a/res/values/strings.xml b/res/values/strings.xml index 120e82f4dd..6ff1f16fdf 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -647,6 +647,9 @@ Display power button option that turns off Smart Lock, biometric unlocking, and notifications on the lock screen + Auto reboot + Automatically reboot the device, if the phone hasn\'t been unlocked within the selected number of hours. + Lock screen when trust is lost diff --git a/res/xml/security_dashboard_settings.xml b/res/xml/security_dashboard_settings.xml index b5dcebf6d9..dfb0db65e5 100644 --- a/res/xml/security_dashboard_settings.xml +++ b/res/xml/security_dashboard_settings.xml @@ -55,6 +55,14 @@ android:title="@string/security_settings_face_preference_title" android:summary="@string/summary_placeholder" settings:keywords="@string/keywords_face_settings" /> + + @@ -155,4 +163,4 @@ android:summary="@string/confirm_sim_deletion_description" settings:controller="com.android.settings.security.ConfirmSimDeletionPreferenceController"/> - \ No newline at end of file + diff --git a/src/com/android/settings/security/AutoRebootPreferenceController.java b/src/com/android/settings/security/AutoRebootPreferenceController.java new file mode 100644 index 0000000000..c7a75219a5 --- /dev/null +++ b/src/com/android/settings/security/AutoRebootPreferenceController.java @@ -0,0 +1,82 @@ +package com.android.settings.security; + +import android.content.Context; +import android.os.UserManager; +import android.provider.Settings; +import android.util.Log; + +import androidx.preference.ListPreference; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceScreen; + +import com.android.settings.core.PreferenceControllerMixin; +import com.android.settingslib.core.AbstractPreferenceController; +import com.android.settingslib.core.lifecycle.events.OnResume; + +public class AutoRebootPreferenceController extends AbstractPreferenceController + implements PreferenceControllerMixin, OnResume, + Preference.OnPreferenceChangeListener { + + private static final String KEY_AUTO_REBOOT = "auto_reboot"; + private static final String PREF_KEY_SECURITY_CATEGORY = "security_category"; + + private PreferenceCategory mSecurityCategory; + private boolean mIsAdmin; + private final UserManager mUm; + + public AutoRebootPreferenceController(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 KEY_AUTO_REBOOT; + } + + // TODO: should we use onCreatePreferences() instead? + private void updatePreferenceState() { + if (mSecurityCategory == null) { + return; + } + + if (mIsAdmin) { + ListPreference autoReboot = + (ListPreference) mSecurityCategory.findPreference(KEY_AUTO_REBOOT); + autoReboot.setValue(Long.toString(Settings.Global.getLong( + mContext.getContentResolver(), Settings.Global.SETTINGS_REBOOT_AFTER_TIMEOUT, 0))); + } else { + mSecurityCategory.removePreference( + mSecurityCategory.findPreference(KEY_AUTO_REBOOT)); + } + } + + @Override + public void onResume() { + updatePreferenceState(); + } + + @Override + public boolean onPreferenceChange(Preference preference, Object value) { + final String key = preference.getKey(); + if (KEY_AUTO_REBOOT.equals(key) && mIsAdmin) { + long timeout = Long.parseLong((String) value); + Settings.Global.putLong(mContext.getContentResolver(), Settings.Global.SETTINGS_REBOOT_AFTER_TIMEOUT, timeout); + } + return true; + } +} diff --git a/src/com/android/settings/security/SecuritySettings.java b/src/com/android/settings/security/SecuritySettings.java index 2f2b349c72..953012f9e7 100644 --- a/src/com/android/settings/security/SecuritySettings.java +++ b/src/com/android/settings/security/SecuritySettings.java @@ -118,6 +118,7 @@ public class SecuritySettings extends DashboardFragment { securityPreferenceControllers.add(new FaceStatusPreferenceController(context)); securityPreferenceControllers.add(new FingerprintStatusPreferenceController(context)); securityPreferenceControllers.add(new ChangeScreenLockPreferenceController(context, host)); + securityPreferenceControllers.add(new AutoRebootPreferenceController(context)); controllers.add(new PreferenceCategoryController(context, SECURITY_CATEGORY) .setChildren(securityPreferenceControllers)); controllers.addAll(securityPreferenceControllers);