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

Commit c5ab7ce4 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/27914207',... 

Merge cherrypicks of ['googleplex-android-review.googlesource.com/27914207', 'googleplex-android-review.googlesource.com/28034703', 'googleplex-android-review.googlesource.com/28037933', 'googleplex-android-review.googlesource.com/28040051', 'googleplex-android-review.googlesource.com/28016800', 'googleplex-android-review.googlesource.com/27976286', 'googleplex-android-review.googlesource.com/28051456'] into 24Q3-release.

Change-Id: I76ba98e5b6e29bd5dc5dacbc87ac442ca320df3e
parents 200b35ad 869a369d

core/java/android/provider/Settings.java

+7 −0
Original line number Diff line number Diff line
@@ -11065,6 +11065,13 @@ public final class Settings { 
        public static final String ACTIVE_UNLOCK_ON_BIOMETRIC_FAIL =

                "active_unlock_on_biometric_fail";













        /**













         * Whether or not active unlock triggers on legacy unlock intents.













         * @hide













         */













        public static final String ACTIVE_UNLOCK_ON_UNLOCK_INTENT_LEGACY =













                "active_unlock_on_unlock_intent_legacy";



























        /**















         * If active unlock triggers on biometric failures, include the following error codes















         * as a biometric failure. See {@link android.hardware.biometrics.BiometricFaceConstants}.

































core/java/android/view/InsetsAnimationThreadControlRunner.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -89,7 +89,7 @@ public class InsetsAnimationThreadControlRunner implements InsetsAnimationContro













                SyncRtSurfaceTransactionApplier.SurfaceParams surfaceParams = params[i];















                applyParams(t, surfaceParams, mTmpFloat9);















            }













            t.setFrameTimelineVsync(Choreographer.getSfInstance().getVsyncId());













            t.setFrameTimelineVsync(Choreographer.getInstance().getVsyncId());















            t.apply();















            t.close();















        }

































core/java/android/view/ViewRootImpl.java



+1
−2




























Original line number
Diff line number
Diff line








@@ -1267,7 +1267,6 @@ public final class ViewRootImpl implements ViewParent,













        mDensity = context.getResources().getDisplayMetrics().densityDpi;















        mNoncompatDensity = context.getResources().getDisplayMetrics().noncompatDensityDpi;















        mFallbackEventHandler = new PhoneFallbackEventHandler(context);













        // TODO(b/222696368): remove getSfInstance usage and use vsyncId for transactions















        mChoreographer = Choreographer.getInstance();















        mInsetsController = new InsetsController(new ViewRootInsetsControllerHost(this));















        mImeBackAnimationController = new ImeBackAnimationController(this, mInsetsController);










@@ -4406,7 +4405,7 @@ public final class ViewRootImpl implements ViewParent,













        if (mAppStartInfoTimestampsFlagValue && !mAppStartTrackingStarted) {















            mAppStartTrackingStarted = true;















            Transaction transaction = new Transaction();













            transaction.addTransactionCompletedListener(mExecutor,













            transaction.addTransactionCompletedListener(mSimpleExecutor,















                    new Consumer<TransactionStats>() {















                        @Override















                        public void accept(TransactionStats transactionStats) {

































packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java



+1
−0




























Original line number
Diff line number
Diff line








@@ -134,6 +134,7 @@ public class SecureSettings {













        Settings.Secure.SFPS_PERFORMANT_AUTH_ENABLED,















        Settings.Secure.ACTIVE_UNLOCK_ON_WAKE,















        Settings.Secure.ACTIVE_UNLOCK_ON_UNLOCK_INTENT,













        Settings.Secure.ACTIVE_UNLOCK_ON_UNLOCK_INTENT_LEGACY,















        Settings.Secure.ACTIVE_UNLOCK_ON_BIOMETRIC_FAIL,















        Settings.Secure.ACTIVE_UNLOCK_ON_FACE_ERRORS,















        Settings.Secure.ACTIVE_UNLOCK_ON_FACE_ACQUIRE_INFO,

































packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java



+1
−0




























Original line number
Diff line number
Diff line








@@ -195,6 +195,7 @@ public class SecureSettingsValidators {













        VALIDATORS.put(Secure.ACTIVE_UNLOCK_ON_WAKE, BOOLEAN_VALIDATOR);















        VALIDATORS.put(Secure.ACTIVE_UNLOCK_ON_UNLOCK_INTENT, BOOLEAN_VALIDATOR);















        VALIDATORS.put(Secure.ACTIVE_UNLOCK_ON_BIOMETRIC_FAIL, BOOLEAN_VALIDATOR);













        VALIDATORS.put(Secure.ACTIVE_UNLOCK_ON_UNLOCK_INTENT_LEGACY, BOOLEAN_VALIDATOR);















        VALIDATORS.put(Secure.ACTIVE_UNLOCK_ON_FACE_ERRORS, ANY_STRING_VALIDATOR);















        VALIDATORS.put(Secure.ACTIVE_UNLOCK_ON_FACE_ACQUIRE_INFO, ANY_STRING_VALIDATOR);















        VALIDATORS.put(Secure.ACTIVE_UNLOCK_ON_UNLOCK_INTENT_WHEN_BIOMETRIC_ENROLLED,