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

Commit 80084aef authored by Grace Cheng's avatar Grace Cheng Committed by Android (Google) Code Review
Browse files

Merge "Rename AdaptiveAuthenticationService" into main

parents 29fdded9 cef56d18

core/java/android/adaptiveauth/OWNERS

+1 −1
Original line number Diff line number Diff line 
include /services/core/java/com/android/server/security/adaptiveauthentication/OWNERS
 
 No newline at end of file
 
include /services/core/java/com/android/server/security/authenticationpolicy/OWNERS
 
 No newline at end of file

services/core/java/com/android/server/security/adaptiveauthentication/AdaptiveAuthenticationService.java→services/core/java/com/android/server/security/authenticationpolicy/AuthenticationPolicyService.java

+5 −5
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.server.security.adaptiveauthentication;

package com.android.server.security.authenticationpolicy;



import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.SOME_AUTH_REQUIRED_AFTER_ADAPTIVE_AUTH_REQUEST;
@@ -55,8 +55,8 @@ import java.util.Objects; 
/**

 * @hide

 */

public class AdaptiveAuthenticationService extends SystemService {

    private static final String TAG = "AdaptiveAuthenticationService";

public class AuthenticationPolicyService extends SystemService {

    private static final String TAG = "AuthenticationPolicyService";

    private static final boolean DEBUG = Build.IS_DEBUGGABLE && Log.isLoggable(TAG, Log.DEBUG);



    @VisibleForTesting
@@ -78,12 +78,12 @@ public class AdaptiveAuthenticationService extends SystemService { 
    final SparseIntArray mFailedAttemptsForUser = new SparseIntArray();

    private final SparseLongArray mLastLockedTimestamp = new SparseLongArray();



    public AdaptiveAuthenticationService(Context context) {

    public AuthenticationPolicyService(Context context) {

        this(context, new LockPatternUtils(context));

    }



    @VisibleForTesting

    public AdaptiveAuthenticationService(Context context, LockPatternUtils lockPatternUtils) {

    public AuthenticationPolicyService(Context context, LockPatternUtils lockPatternUtils) {

        super(context);

        mLockPatternUtils = lockPatternUtils;

        mLockSettings = Objects.requireNonNull(

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

+3 −3
Original line number Diff line number Diff line
@@ -249,8 +249,8 @@ import com.android.server.security.AttestationVerificationManagerService; 
import com.android.server.security.FileIntegrityService;

import com.android.server.security.KeyAttestationApplicationIdProviderService;

import com.android.server.security.KeyChainSystemService;

import com.android.server.security.adaptiveauthentication.AdaptiveAuthenticationService;

import com.android.server.security.advancedprotection.AdvancedProtectionService;

import com.android.server.security.authenticationpolicy.AuthenticationPolicyService;

import com.android.server.security.forensic.ForensicService;

import com.android.server.security.rkp.RemoteProvisioningService;

import com.android.server.selinux.SelinuxAuditLogsService;
@@ -2660,8 +2660,8 @@ public final class SystemServer implements Dumpable { 
            t.traceEnd();



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

                t.traceBegin("StartAdaptiveAuthenticationService");

                mSystemServiceManager.startService(AdaptiveAuthenticationService.class);

                t.traceBegin("StartAuthenticationPolicyService");

                mSystemServiceManager.startService(AuthenticationPolicyService.class);

                t.traceEnd();

            }

services/tests/servicestests/src/com/android/server/security/adaptiveauthentication/OWNERS

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
include /services/core/java/com/android/server/security/adaptiveauthentication/OWNERS
 
 No newline at end of file