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

Commit fffcf619 authored by ELIYAZ MOMIN (xWF)'s avatar ELIYAZ MOMIN (xWF) Committed by Android (Google) Code Review
Browse files

Revert "Add adb (Settings.Secure) CLI for disabling the adaptive auth auto lock." 

This reverts commit 5b130b65.

Reason for revert: <Potential culprit for  b/389790699   - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted>

Change-Id: I2791ee870c86922c06b9adf9951bb38b43ab23cf
parent 5b130b65

core/java/android/provider/Settings.java

+0 −13
Original line number Original line Diff line number Diff line
@@ -12876,19 +12876,6 @@ public final class Settings { 
         */

         */

        public static final String DISABLE_SECURE_WINDOWS = "disable_secure_windows";

        public static final String DISABLE_SECURE_WINDOWS = "disable_secure_windows";

















        /**














         * Controls if the adaptive authentication feature should be disabled, which














         * will attempt to lock the device after a number of consecutive authentication














         * attempts fail.














         *














         * This can only be disabled on debuggable builds. Set to 1 to disable or 0 for the














         * normal behavior.














         *














         * @hide














         */














        public static final String DISABLE_ADAPTIVE_AUTH_LIMIT_LOCK =














                "disable_adaptive_auth_limit_lock";



























        /** @hide */







        /** @hide */











        public static final int PRIVATE_SPACE_AUTO_LOCK_ON_DEVICE_LOCK = 0;







        public static final int PRIVATE_SPACE_AUTO_LOCK_ON_DEVICE_LOCK = 0;











        /** @hide */







        /** @hide */

































core/java/android/security/flags.aconfig



+1
−8




























Original line number
Original line
Diff line number
Diff line








@@ -146,10 +146,3 @@ flag {









    bug: "380120712"







    bug: "380120712"











    is_fixed_read_only: true







    is_fixed_read_only: true











}






}

























flag {














    name: "disable_adaptive_auth_counter_lock"














    namespace: "biometrics"














    description: "Flag to allow an adb secure setting to disable the adaptive auth lock"














    bug: "371057865"














}



























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



+0
−1




























Original line number
Original line
Diff line number
Diff line








@@ -454,6 +454,5 @@ public class SecureSettingsValidators {









        VALIDATORS.put(Secure.MANDATORY_BIOMETRICS_REQUIREMENTS_SATISFIED,







        VALIDATORS.put(Secure.MANDATORY_BIOMETRICS_REQUIREMENTS_SATISFIED,











                new InclusiveIntegerRangeValidator(0, 1));







                new InclusiveIntegerRangeValidator(0, 1));











        VALIDATORS.put(Secure.ADVANCED_PROTECTION_MODE, BOOLEAN_VALIDATOR);







        VALIDATORS.put(Secure.ADVANCED_PROTECTION_MODE, BOOLEAN_VALIDATOR);











        VALIDATORS.put(Secure.DISABLE_ADAPTIVE_AUTH_LIMIT_LOCK, BOOLEAN_VALIDATOR);














    }







    }











}






}
























packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java



+0
−1




























Original line number
Original line
Diff line number
Diff line








@@ -690,7 +690,6 @@ public class SettingsBackupTest {









                 Settings.Secure.DEFAULT_DEVICE_INPUT_METHOD,







                 Settings.Secure.DEFAULT_DEVICE_INPUT_METHOD,











                 Settings.Secure.DEVICE_PAIRED,







                 Settings.Secure.DEVICE_PAIRED,











                 Settings.Secure.DIALER_DEFAULT_APPLICATION,







                 Settings.Secure.DIALER_DEFAULT_APPLICATION,











                 Settings.Secure.DISABLE_ADAPTIVE_AUTH_LIMIT_LOCK,














                 Settings.Secure.DISABLED_PRINT_SERVICES,







                 Settings.Secure.DISABLED_PRINT_SERVICES,











                 Settings.Secure.DISABLE_SECURE_WINDOWS,







                 Settings.Secure.DISABLE_SECURE_WINDOWS,











                 Settings.Secure.DISABLED_SYSTEM_INPUT_METHODS,







                 Settings.Secure.DISABLED_SYSTEM_INPUT_METHODS,

































services/core/java/com/android/server/security/authenticationpolicy/AuthenticationPolicyService.java



+0
−13




























Original line number
Original line
Diff line number
Diff line








@@ -17,7 +17,6 @@









package com.android.server.security.authenticationpolicy;







package com.android.server.security.authenticationpolicy;































import static android.Manifest.permission.MANAGE_SECURE_LOCK_DEVICE;







import static android.Manifest.permission.MANAGE_SECURE_LOCK_DEVICE;











import static android.security.Flags.disableAdaptiveAuthCounterLock;


































import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.SOME_AUTH_REQUIRED_AFTER_ADAPTIVE_AUTH_REQUEST;







import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.SOME_AUTH_REQUIRED_AFTER_ADAPTIVE_AUTH_REQUEST;





























@@ -40,7 +39,6 @@ import android.os.IBinder;









import android.os.Looper;







import android.os.Looper;











import android.os.Message;







import android.os.Message;











import android.os.SystemClock;







import android.os.SystemClock;











import android.provider.Settings;














import android.security.authenticationpolicy.AuthenticationPolicyManager;







import android.security.authenticationpolicy.AuthenticationPolicyManager;











import android.security.authenticationpolicy.DisableSecureLockDeviceParams;







import android.security.authenticationpolicy.DisableSecureLockDeviceParams;











import android.security.authenticationpolicy.EnableSecureLockDeviceParams;







import android.security.authenticationpolicy.EnableSecureLockDeviceParams;










@@ -253,17 +251,6 @@ public class AuthenticationPolicyService extends SystemService {









            return;







            return;











        }







        }































        if (disableAdaptiveAuthCounterLock() && Build.IS_DEBUGGABLE) {














            final boolean disabled = Settings.Secure.getIntForUser(














                    getContext().getContentResolver(),














                    Settings.Secure.DISABLE_ADAPTIVE_AUTH_LIMIT_LOCK,














                    0 /* default */, userId) != 0;














            if (disabled) {














                Slog.d(TAG, "not locking (disabled by user)");














                return;














            }














        }





























        //TODO: additionally consider the trust signal before locking device







        //TODO: additionally consider the trust signal before locking device











        lockDevice(userId);







        lockDevice(userId);











    }







    }