Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Always show lockdown button" into sc-dev

Browse Source
This commit is contained in:
Beth Thibodeau
2021-07-15 22:44:24 +00:00
committed by Android (Google) Code Review
parent 2db6435bb2 eb151ee8d0
commit 04697f8263
5 changed files with 0 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/provider/Settings.java
View File

@@ -9659,13 +9659,6 @@ public final class Settings {
@Readable @Readable
public static final String QS_AUTO_ADDED_TILES = "qs_auto_tiles"; public static final String QS_AUTO_ADDED_TILES = "qs_auto_tiles";
/**
* Whether the Lockdown button should be shown in the power menu.
* @hide
*/
@Readable
public static final String LOCKDOWN_IN_POWER_MENU = "lockdown_in_power_menu";
/** /**
* Backup manager behavioral parameters. * Backup manager behavioral parameters.
* This is encoded as a key=value list, separated by commas. Ex: * This is encoded as a key=value list, separated by commas. Ex:

1
packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java
View File

@@ -123,7 +123,6 @@ public class SecureSettings {
Settings.Secure.SCREENSAVER_COMPONENTS, Settings.Secure.SCREENSAVER_COMPONENTS,
Settings.Secure.SCREENSAVER_ACTIVATE_ON_DOCK, Settings.Secure.SCREENSAVER_ACTIVATE_ON_DOCK,
Settings.Secure.SCREENSAVER_ACTIVATE_ON_SLEEP, Settings.Secure.SCREENSAVER_ACTIVATE_ON_SLEEP,
Settings.Secure.LOCKDOWN_IN_POWER_MENU,
Settings.Secure.SHOW_FIRST_CRASH_DIALOG_DEV_OPTION, Settings.Secure.SHOW_FIRST_CRASH_DIALOG_DEV_OPTION,
Settings.Secure.VOLUME_HUSH_GESTURE, Settings.Secure.VOLUME_HUSH_GESTURE,
Settings.Secure.MANUAL_RINGER_TOGGLE_COUNT, Settings.Secure.MANUAL_RINGER_TOGGLE_COUNT,

1
packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java
View File

@@ -177,7 +177,6 @@ public class SecureSettingsValidators {
VALIDATORS.put(Secure.SCREENSAVER_COMPONENTS, COMMA_SEPARATED_COMPONENT_LIST_VALIDATOR); VALIDATORS.put(Secure.SCREENSAVER_COMPONENTS, COMMA_SEPARATED_COMPONENT_LIST_VALIDATOR);
VALIDATORS.put(Secure.SCREENSAVER_ACTIVATE_ON_DOCK, BOOLEAN_VALIDATOR); VALIDATORS.put(Secure.SCREENSAVER_ACTIVATE_ON_DOCK, BOOLEAN_VALIDATOR);
VALIDATORS.put(Secure.SCREENSAVER_ACTIVATE_ON_SLEEP, BOOLEAN_VALIDATOR); VALIDATORS.put(Secure.SCREENSAVER_ACTIVATE_ON_SLEEP, BOOLEAN_VALIDATOR);
VALIDATORS.put(Secure.LOCKDOWN_IN_POWER_MENU, BOOLEAN_VALIDATOR);
VALIDATORS.put(Secure.SHOW_FIRST_CRASH_DIALOG_DEV_OPTION, BOOLEAN_VALIDATOR); VALIDATORS.put(Secure.SHOW_FIRST_CRASH_DIALOG_DEV_OPTION, BOOLEAN_VALIDATOR);
VALIDATORS.put(Secure.VOLUME_HUSH_GESTURE, NON_NEGATIVE_INTEGER_VALIDATOR); VALIDATORS.put(Secure.VOLUME_HUSH_GESTURE, NON_NEGATIVE_INTEGER_VALIDATOR);
VALIDATORS.put( VALIDATORS.put(

3
packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java
View File

@@ -2223,9 +2223,6 @@ class SettingsProtoDumpUtil {
dumpSetting(s, p, dumpSetting(s, p,
Settings.Secure.LOCK_TO_APP_EXIT_LOCKED, Settings.Secure.LOCK_TO_APP_EXIT_LOCKED,
SecureSettingsProto.LOCK_TO_APP_EXIT_LOCKED); SecureSettingsProto.LOCK_TO_APP_EXIT_LOCKED);
dumpSetting(s, p,
Settings.Secure.LOCKDOWN_IN_POWER_MENU,
SecureSettingsProto.LOCKDOWN_IN_POWER_MENU);
dumpSetting(s, p, dumpSetting(s, p,
Settings.Secure.LONG_PRESS_TIMEOUT, Settings.Secure.LONG_PRESS_TIMEOUT,
SecureSettingsProto.LONG_PRESS_TIMEOUT); SecureSettingsProto.LONG_PRESS_TIMEOUT);

5
packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java
View File

@@ -669,11 +669,6 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene
int userId = user.id; int userId = user.id;
// No lockdown option if it's not turned on in Settings
if (mSecureSettings.getIntForUser(Settings.Secure.LOCKDOWN_IN_POWER_MENU, 0, userId) == 0) {
return false;
}
// Lockdown is meaningless without a place to go. // Lockdown is meaningless without a place to go.
if (!mKeyguardStateController.isMethodSecure()) { if (!mKeyguardStateController.isMethodSecure()) {
return false; return false;