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

Commit eaf38190 authored by Grace Cheng's avatar Grace Cheng
Browse files

Rename AdaptiveAuth and move to security package 

Rename AdaptiveAuthService to AdaptiveAuthenticationService and nest in
security package, rename packages from adaptive auth to adaptive
authentication. Leaving flags package as is, since the package name is
part of the flag identifier.

Test: atest AdaptiveAuthenticationServiceTest
Flag: NONE renaming files
Bug: N/A
Change-Id: I38fb343b483e4d818707aefe15a2b07c888cd6f0
parent 5fe41e4a

core/java/android/adaptiveauth/OWNERS

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

services/core/java/com/android/server/adaptiveauth/AdaptiveAuthService.java→services/core/java/com/android/server/security/adaptiveauthentication/AdaptiveAuthenticationService.java

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

 */



package com.android.server.adaptiveauth;

package com.android.server.security.adaptiveauthentication;



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 AdaptiveAuthService extends SystemService {

    private static final String TAG = "AdaptiveAuthService";

public class AdaptiveAuthenticationService extends SystemService {

    private static final String TAG = "AdaptiveAuthenticationService";

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



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

    private final SparseLongArray mLastLockedTimestamp = new SparseLongArray();



    public AdaptiveAuthService(Context context) {

    public AdaptiveAuthenticationService(Context context) {

        this(context, new LockPatternUtils(context));

    }



    @VisibleForTesting

    public AdaptiveAuthService(Context context, LockPatternUtils lockPatternUtils) {

    public AdaptiveAuthenticationService(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
@@ -119,7 +119,6 @@ import com.android.internal.widget.ILockSettings; 
import com.android.internal.widget.LockSettingsInternal;

import com.android.server.accessibility.AccessibilityManagerService;

import com.android.server.accounts.AccountManagerService;

import com.android.server.adaptiveauth.AdaptiveAuthService;

import com.android.server.adb.AdbService;

import com.android.server.alarm.AlarmManagerService;

import com.android.server.am.ActivityManagerService;
@@ -249,6 +248,7 @@ 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.rkp.RemoteProvisioningService;

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



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

                t.traceBegin("StartAdaptiveAuthService");

                mSystemServiceManager.startService(AdaptiveAuthService.class);

                t.traceBegin("StartAdaptiveAuthenticationService");

                mSystemServiceManager.startService(AdaptiveAuthenticationService.class);

                t.traceEnd();

            }

services/tests/servicestests/src/com/android/server/adaptiveauth/OWNERS

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