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

Commit 709727fc authored by Kevin Chyn's avatar Kevin Chyn
Browse files

Fix AuthControllerTest 

Fixes: 161983364

Test: atest com.android.systemui.biometrics
Change-Id: Ic20b12526f4e96061cea43e197e091c0b6984b57
parent 00212168

packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java

+5 −4
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ import android.content.BroadcastReceiver; 
import android.content.Context;

import android.content.Intent;

import android.content.IntentFilter;

import android.content.pm.PackageManager;

import android.content.res.Configuration;

import android.hardware.biometrics.BiometricAuthenticator;

import android.hardware.biometrics.BiometricConstants;
@@ -39,12 +38,10 @@ import android.hardware.biometrics.PromptInfo; 
import android.hardware.face.FaceManager;

import android.hardware.fingerprint.FingerprintManager;

import android.hardware.fingerprint.FingerprintSensorProperties;

import android.hardware.fingerprint.IFingerprintService;

import android.os.Bundle;

import android.os.Handler;

import android.os.Looper;

import android.os.RemoteException;

import android.os.ServiceManager;

import android.util.Log;

import android.view.WindowManager;
@@ -247,6 +244,10 @@ public class AuthController extends SystemUI implements CommandQueue.Callbacks, 
        IActivityTaskManager getActivityTaskManager() {

            return ActivityTaskManager.getService();

        }



        FingerprintManager getFingerprintManager(Context context) {

            return context.getSystemService(FingerprintManager.class);

        }

    }



    @Inject
@@ -273,7 +274,7 @@ public class AuthController extends SystemUI implements CommandQueue.Callbacks, 
        mWindowManager = (WindowManager) mContext.getSystemService(Context.WINDOW_SERVICE);

        mActivityTaskManager = mInjector.getActivityTaskManager();



        final FingerprintManager fpm = mContext.getSystemService(FingerprintManager.class);

        final FingerprintManager fpm = mInjector.getFingerprintManager(mContext);

        if (fpm != null && fpm.isHardwareDetected()) {

            final List<FingerprintSensorProperties> fingerprintSensorProperties =

                    fpm.getSensorProperties();

packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthControllerTest.java

+6 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ import android.hardware.biometrics.BiometricPrompt; 
import android.hardware.biometrics.IBiometricSysuiReceiver;

import android.hardware.biometrics.PromptInfo;

import android.hardware.face.FaceManager;

import android.hardware.fingerprint.FingerprintManager;

import android.os.Bundle;

import android.test.suitebuilder.annotation.SmallTest;

import android.testing.AndroidTestingRunner;
@@ -530,6 +531,11 @@ public class AuthControllerTest extends SysuiTestCase { 
        IActivityTaskManager getActivityTaskManager() {

            return mock(IActivityTaskManager.class);

        }



        @Override

        FingerprintManager getFingerprintManager(Context context) {

            return mock(FingerprintManager.class);

        }

    }

}