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

Commit 3d4617fd authored by Eric Biggers's avatar Eric Biggers Committed by Android (Google) Code Review
Browse files

Merge "Remove flag android.adaptiveauth.enable_adaptive_auth" into main

parents 05d8cf03 7fcdd8bd

core/java/android/adaptiveauth/flags.aconfig

+0 −7
Original line number Diff line number Diff line 
package: "android.adaptiveauth"

container: "system"



flag {

  name: "enable_adaptive_auth"

  namespace: "biometrics"

  description: "Feature flag for enabling the new adaptive auth service"

  bug: "285053096"

}



flag {

  name: "report_biometric_auth_attempts"

  namespace: "biometrics"

packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java

+1 −4
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


package com.android.systemui.statusbar;



import static android.adaptiveauth.Flags.enableAdaptiveAuth;

import static android.app.admin.DevicePolicyManager.DEVICE_OWNER_TYPE_FINANCED;

import static android.app.admin.DevicePolicyResources.Strings.SystemUi.KEYGUARD_MANAGEMENT_DISCLOSURE;

import static android.app.admin.DevicePolicyResources.Strings.SystemUi.KEYGUARD_NAMED_MANAGEMENT_DISCLOSURE;
@@ -532,9 +531,7 @@ public class KeyguardIndicationController { 
        updateLockScreenAlignmentMsg();

        updateLockScreenLogoutView();

        updateLockScreenPersistentUnlockMsg();

        if (enableAdaptiveAuth()) {

        updateLockScreenAdaptiveAuthMsg(userId);

        }

        if (showLockedByYourWatchKeyguardIndicator()) {

            updateLockScreenWatchDisconnectedMsg(userId);

        }

services/java/com/android/server/SystemServer.java

+3 −5
Original line number Diff line number Diff line
@@ -2735,12 +2735,10 @@ public final class SystemServer implements Dumpable { 
                    t.traceEnd();

                }



                if (android.adaptiveauth.Flags.enableAdaptiveAuth()) {

                t.traceBegin("StartAuthenticationPolicyService");

                mSystemServiceManager.startService(AuthenticationPolicyService.class);

                t.traceEnd();

            }

            }



            if (!isWatch) {

                // We don't run this on watches as there are no plans to use the data logged

services/tests/servicestests/src/com/android/server/security/authenticationpolicy/AuthenticationPolicyServiceTest.java

+0 −2
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


package com.android.server.security.authenticationpolicy;



import static android.adaptiveauth.Flags.FLAG_ENABLE_ADAPTIVE_AUTH;

import static android.adaptiveauth.Flags.FLAG_REPORT_BIOMETRIC_AUTH_ATTEMPTS;

import static android.security.authenticationpolicy.AuthenticationPolicyManager.ERROR_UNSUPPORTED;
@@ -110,7 +109,6 @@ public class AuthenticationPolicyServiceTest { 
    public void setUp() {

        MockitoAnnotations.initMocks(this);



        mSetFlagsRule.enableFlags(FLAG_ENABLE_ADAPTIVE_AUTH);

        mSetFlagsRule.enableFlags(FLAG_REPORT_BIOMETRIC_AUTH_ATTEMPTS);



        mContext = spy(ApplicationProvider.getApplicationContext());