Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d7a5eaa authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [9231374, 9231389, 9231390, 9231391, 9231375, 9231286,... 

Merge cherrypicks of [9231374, 9231389, 9231390, 9231391, 9231375, 9231286, 9231355, 9231376, 9231420, 9231462, 9231356, 9231421, 9231422, 9231402, 9231537, 9231557, 9231440, 9231441, 9231287, 9231288, 9231463, 9231464, 9231465, 9231423, 9231289, 9231392, 9230416, 9231466] into qt-c2f2-release

Change-Id: I99830fbed77900bc68b49e5f94441d102398bc75
parents 71ac02c4 24e9ba54

core/java/android/provider/Settings.java

+0 −12
Original line number Diff line number Diff line
@@ -8341,16 +8341,6 @@ public final class Settings { 
        private static final Validator FACE_UNLOCK_ALWAYS_REQUIRE_CONFIRMATION_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.















         * @hide










@@ -9190,8 +9180,6 @@ public final class Settings {













            VALIDATORS.put(FACE_UNLOCK_APP_ENABLED, FACE_UNLOCK_APP_ENABLED_VALIDATOR);















            VALIDATORS.put(FACE_UNLOCK_ALWAYS_REQUIRE_CONFIRMATION,















                    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_SILENCE_ALERTS_ENABLED,















                    ASSIST_GESTURE_SILENCE_ALERTS_ENABLED_VALIDATOR);

































core/java/android/view/contentcapture/MainContentCaptureSession.java



+2
−4




























Original line number
Diff line number
Diff line








@@ -480,6 +480,8 @@ public final class MainContentCaptureSession extends ContentCaptureSession {













            return;















        }





























        mNextFlushForTextChanged = false;





























        final int numberEvents = mEvents.size();















        final String reasonString = getFlushReasonAsString(reason);















        if (sDebug) {









@@ -495,10 +497,6 @@ public final class MainContentCaptureSession extends ContentCaptureSession {













        try {















            mHandler.removeMessages(MSG_FLUSH);





























            if (reason == FLUSH_REASON_TEXT_CHANGE_TIMEOUT) {













                mNextFlushForTextChanged = false;













            }





























            final ParceledListSlice<ContentCaptureEvent> events = clearEvents();















            mDirectServiceInterface.sendEvents(events, reason, mManager.mOptions);















        } catch (RemoteException e) {

































core/tests/coretests/src/android/provider/SettingsBackupTest.java



+1
−2




























Original line number
Diff line number
Diff line








@@ -720,8 +720,7 @@ public class SettingsBackupTest {













                 Settings.Secure.LOCATION_ACCESS_CHECK_DELAY_MILLIS,















                 Settings.Secure.BIOMETRIC_DEBUG_ENABLED,















                 Settings.Secure.FACE_UNLOCK_ATTENTION_REQUIRED,













                 Settings.Secure.FACE_UNLOCK_DIVERSITY_REQUIRED,













                 Settings.Secure.FACE_UNLOCK_EDUCATION_INFO_DISPLAYED);













                 Settings.Secure.FACE_UNLOCK_DIVERSITY_REQUIRED);































    @Test















    public void systemSettingsBackedUpOrBlacklisted() {