mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-10-01 01:35:54 -04:00
ad466bd3e4
- 17.1: Add more captive portal server options like 18.1+, disabled: needs fixes - 17.1: Add the hosts toggle like 18.1+ - 18.1: fix junk in patch - 17.1+: hosts toggle: bugfix: fixup localhost handling by switching to strcmp - 15.1: fixes to get hmalloc to compile, does NOT boot Signed-off-by: Tad <tad@spotco.us>
197 lines
7.8 KiB
Diff
197 lines
7.8 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: pratyush <codelab@pratyush.dev>
|
|
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 87fd6e5df6..b2ea885d46 100644
|
|
--- a/res/values/arrays.xml
|
|
+++ b/res/values/arrays.xml
|
|
@@ -170,6 +170,37 @@
|
|
<item>1800000</item>
|
|
</string-array>
|
|
|
|
+ <!-- Auto reboot settings -->
|
|
+ <string-array name="auto_reboot_entries">
|
|
+ <item>Off</item>
|
|
+ <item>10 minutes</item>
|
|
+ <item>30 minutes</item>
|
|
+ <item>1 hour</item>
|
|
+ <item>2 hours</item>
|
|
+ <item>4 hours</item>
|
|
+ <item>8 hours</item>
|
|
+ <item>12 hours</item>
|
|
+ <item>24 hours</item>
|
|
+ <item>36 hours</item>
|
|
+ <item>48 hours</item>
|
|
+ <item>72 hours</item>
|
|
+ </string-array>
|
|
+
|
|
+ <string-array name="auto_reboot_values" translatable="false">
|
|
+ <item>0</item> <!-- Disabled -->
|
|
+ <item>600000</item>
|
|
+ <item>1800000</item>
|
|
+ <item>3600000</item>
|
|
+ <item>7200000</item>
|
|
+ <item>14400000</item>
|
|
+ <item>28800000</item>
|
|
+ <item>43200000</item>
|
|
+ <item>86400000</item>
|
|
+ <item>129600000</item>
|
|
+ <item>172800000</item>
|
|
+ <item>259200000</item>
|
|
+ </string-array>
|
|
+
|
|
<string-array name="entries_font_size">
|
|
<item msgid="6490061470416867723">Small</item>
|
|
<item msgid="3579015730662088893">Default</item>
|
|
diff --git a/res/values/strings.xml b/res/values/strings.xml
|
|
index 0173a8bf31..3d9a6548fc 100644
|
|
--- a/res/values/strings.xml
|
|
+++ b/res/values/strings.xml
|
|
@@ -647,6 +647,9 @@
|
|
<!-- Text shown for the description of the lockdown option -->
|
|
<string name="lockdown_settings_summary">Display power button option that turns off Smart Lock, biometric unlocking, and notifications on the lock screen</string>
|
|
|
|
+ <string name="auto_reboot_title">Auto reboot</string>
|
|
+ <string name="auto_reboot_summary">Automatically reboot the device, if the phone hasn\'t been unlocked within the selected number of hours.</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 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" />
|
|
+
|
|
+ <ListPreference
|
|
+ android:key="auto_reboot"
|
|
+ android:title="@string/auto_reboot_title"
|
|
+ android:summary="@string/auto_reboot_summary"
|
|
+ android:persistent="false"
|
|
+ android:entries="@array/auto_reboot_entries"
|
|
+ android:entryValues="@array/auto_reboot_values" />
|
|
</PreferenceCategory>
|
|
|
|
<!-- work profile security section -->
|
|
@@ -155,4 +163,4 @@
|
|
android:summary="@string/confirm_sim_deletion_description"
|
|
settings:controller="com.android.settings.security.ConfirmSimDeletionPreferenceController"/>
|
|
|
|
-</PreferenceScreen>
|
|
\ No newline at end of file
|
|
+</PreferenceScreen>
|
|
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);
|