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

Merge "Remove unused setting" into qt-r1-dev am: 95a675ce91

Browse Source 
am: d670c6c1f8

Change-Id: Ib27536f48a565716b43b49d7a69f968009087f13
This commit is contained in:
Kevin Chyn
2019-08-19 15:21:44 -07:00
committed by android-build-merger
parent aaa6279a4e d670c6c1f8
commit fb1d9de34d
2 changed files with 1 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8341,16 +8341,6 @@ public final class Settings {
private static final Validator FACE_UNLOCK_ALWAYS_REQUIRE_CONFIRMATION_VALIDATOR = private static final Validator FACE_UNLOCK_ALWAYS_REQUIRE_CONFIRMATION_VALIDATOR =
BOOLEAN_VALIDATOR; BOOLEAN_VALIDATOR;
/**
* Whether or not the face unlock education screen has been shown to the user.
* @hide
*/
public static final String FACE_UNLOCK_EDUCATION_INFO_DISPLAYED =
"face_unlock_education_info_displayed";
private static final Validator FACE_UNLOCK_EDUCATION_INFO_DISPLAYED_VALIDATOR =
BOOLEAN_VALIDATOR;
/** /**
* Whether or not debugging is enabled. * Whether or not debugging is enabled.
* @hide * @hide
@@ -9190,8 +9180,6 @@ public final class Settings {
VALIDATORS.put(FACE_UNLOCK_APP_ENABLED, FACE_UNLOCK_APP_ENABLED_VALIDATOR); VALIDATORS.put(FACE_UNLOCK_APP_ENABLED, FACE_UNLOCK_APP_ENABLED_VALIDATOR);
VALIDATORS.put(FACE_UNLOCK_ALWAYS_REQUIRE_CONFIRMATION, VALIDATORS.put(FACE_UNLOCK_ALWAYS_REQUIRE_CONFIRMATION,
FACE_UNLOCK_ALWAYS_REQUIRE_CONFIRMATION_VALIDATOR); FACE_UNLOCK_ALWAYS_REQUIRE_CONFIRMATION_VALIDATOR);
VALIDATORS.put(FACE_UNLOCK_EDUCATION_INFO_DISPLAYED,
FACE_UNLOCK_EDUCATION_INFO_DISPLAYED_VALIDATOR);
VALIDATORS.put(ASSIST_GESTURE_ENABLED, ASSIST_GESTURE_ENABLED_VALIDATOR); VALIDATORS.put(ASSIST_GESTURE_ENABLED, ASSIST_GESTURE_ENABLED_VALIDATOR);
VALIDATORS.put(ASSIST_GESTURE_SILENCE_ALERTS_ENABLED, VALIDATORS.put(ASSIST_GESTURE_SILENCE_ALERTS_ENABLED,
ASSIST_GESTURE_SILENCE_ALERTS_ENABLED_VALIDATOR); ASSIST_GESTURE_SILENCE_ALERTS_ENABLED_VALIDATOR);

3
core/tests/coretests/src/android/provider/SettingsBackupTest.java
View File

@@ -720,8 +720,7 @@ public class SettingsBackupTest {
Settings.Secure.LOCATION_ACCESS_CHECK_DELAY_MILLIS, Settings.Secure.LOCATION_ACCESS_CHECK_DELAY_MILLIS,
Settings.Secure.BIOMETRIC_DEBUG_ENABLED, Settings.Secure.BIOMETRIC_DEBUG_ENABLED,
Settings.Secure.FACE_UNLOCK_ATTENTION_REQUIRED, Settings.Secure.FACE_UNLOCK_ATTENTION_REQUIRED,
Settings.Secure.FACE_UNLOCK_DIVERSITY_REQUIRED, Settings.Secure.FACE_UNLOCK_DIVERSITY_REQUIRED);
Settings.Secure.FACE_UNLOCK_EDUCATION_INFO_DISPLAYED);
@Test @Test
public void systemSettingsBackedUpOrBlacklisted() { public void systemSettingsBackedUpOrBlacklisted() {