Merge "Replace RequiresFlagsEnabled and RequiresFlagsDisabled" into main (723bdf57) · Commits · e / os / android_frameworks_base

packages/SystemUI/tests/src/com/android/systemui/biometrics/data/repository/BiometricStatusRepositoryTest.kt

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -24,7 +24,6 @@ import android.hardware.biometrics.BiometricRequestConstants.REASON_AUTH_OTHER
	import android.hardware.biometrics.BiometricRequestConstants.REASON_AUTH_SETTINGS		import android.hardware.biometrics.BiometricRequestConstants.REASON_AUTH_SETTINGS
	import android.hardware.biometrics.BiometricRequestConstants.REASON_ENROLL_ENROLLING		import android.hardware.biometrics.BiometricRequestConstants.REASON_ENROLL_ENROLLING
	import android.hardware.biometrics.BiometricRequestConstants.REASON_ENROLL_FIND_SENSOR		import android.hardware.biometrics.BiometricRequestConstants.REASON_ENROLL_FIND_SENSOR
	import android.platform.test.annotations.RequiresFlagsEnabled
	import androidx.test.filters.SmallTest		import androidx.test.filters.SmallTest
	import com.android.systemui.SysuiTestCase		import com.android.systemui.SysuiTestCase
	import com.android.systemui.biometrics.shared.model.AuthenticationReason		import com.android.systemui.biometrics.shared.model.AuthenticationReason
	@@ -48,7 +47,6 @@ import org.mockito.Mockito.verify
	import org.mockito.junit.MockitoJUnit		import org.mockito.junit.MockitoJUnit
	import org.mockito.junit.MockitoRule		import org.mockito.junit.MockitoRule

	@RequiresFlagsEnabled(FLAG_SIDEFPS_CONTROLLER_REFACTOR)
	@OptIn(ExperimentalCoroutinesApi::class)		@OptIn(ExperimentalCoroutinesApi::class)
	@SmallTest		@SmallTest
	@RunWith(JUnit4::class)		@RunWith(JUnit4::class)
	@@ -62,6 +60,7 @@ class BiometricStatusRepositoryTest : SysuiTestCase() {

	@Before		@Before
	fun setUp() {		fun setUp() {
			mSetFlagsRule.enableFlags(FLAG_SIDEFPS_CONTROLLER_REFACTOR)
	underTest = BiometricStatusRepositoryImpl(testScope.backgroundScope, biometricManager)		underTest = BiometricStatusRepositoryImpl(testScope.backgroundScope, biometricManager)
	}		}

packages/SystemUI/tests/src/com/android/systemui/biometrics/domain/interactor/BiometricStatusInteractorImplTest.kt

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -19,7 +19,6 @@ package com.android.systemui.biometrics.domain.interactor
	import android.app.ActivityManager		import android.app.ActivityManager
	import android.app.ActivityTaskManager		import android.app.ActivityTaskManager
	import android.content.ComponentName		import android.content.ComponentName
	import android.platform.test.annotations.RequiresFlagsEnabled
	import androidx.test.filters.SmallTest		import androidx.test.filters.SmallTest
	import com.android.systemui.SysuiTestCase		import com.android.systemui.SysuiTestCase
	import com.android.systemui.biometrics.data.repository.FakeBiometricStatusRepository		import com.android.systemui.biometrics.data.repository.FakeBiometricStatusRepository
	@@ -44,7 +43,6 @@ import org.mockito.Mockito.`when`
	import org.mockito.junit.MockitoJUnit		import org.mockito.junit.MockitoJUnit
	import org.mockito.junit.MockitoRule		import org.mockito.junit.MockitoRule

	@RequiresFlagsEnabled(FLAG_SIDEFPS_CONTROLLER_REFACTOR)
	@OptIn(ExperimentalCoroutinesApi::class)		@OptIn(ExperimentalCoroutinesApi::class)
	@SmallTest		@SmallTest
	@RunWith(JUnit4::class)		@RunWith(JUnit4::class)
	@@ -59,6 +57,7 @@ class BiometricStatusInteractorImplTest : SysuiTestCase() {

	@Before		@Before
	fun setup() {		fun setup() {
			mSetFlagsRule.enableFlags(FLAG_SIDEFPS_CONTROLLER_REFACTOR)
	biometricStatusRepository = FakeBiometricStatusRepository()		biometricStatusRepository = FakeBiometricStatusRepository()
	underTest = BiometricStatusInteractorImpl(activityTaskManager, biometricStatusRepository)		underTest = BiometricStatusInteractorImpl(activityTaskManager, biometricStatusRepository)
	}		}

packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/DeviceEntrySideFpsOverlayInteractorTest.kt

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -17,7 +17,6 @@
	package com.android.systemui.keyguard.domain.interactor		package com.android.systemui.keyguard.domain.interactor

	import android.os.Handler		import android.os.Handler
	import android.platform.test.annotations.RequiresFlagsEnabled
	import androidx.test.filters.SmallTest		import androidx.test.filters.SmallTest
	import com.android.keyguard.KeyguardSecurityModel		import com.android.keyguard.KeyguardSecurityModel
	import com.android.keyguard.KeyguardUpdateMonitor		import com.android.keyguard.KeyguardUpdateMonitor
	@@ -58,7 +57,6 @@ import org.mockito.junit.MockitoJUnit
	import org.mockito.junit.MockitoRule		import org.mockito.junit.MockitoRule

	@OptIn(ExperimentalCoroutinesApi::class)		@OptIn(ExperimentalCoroutinesApi::class)
	@RequiresFlagsEnabled(FLAG_SIDEFPS_CONTROLLER_REFACTOR)
	@SmallTest		@SmallTest
	@RunWith(JUnit4::class)		@RunWith(JUnit4::class)
	class DeviceEntrySideFpsOverlayInteractorTest : SysuiTestCase() {		class DeviceEntrySideFpsOverlayInteractorTest : SysuiTestCase() {
	@@ -80,6 +78,7 @@ class DeviceEntrySideFpsOverlayInteractorTest : SysuiTestCase() {

	@Before		@Before
	fun setup() {		fun setup() {
			mSetFlagsRule.enableFlags(FLAG_SIDEFPS_CONTROLLER_REFACTOR)
	primaryBouncerInteractor =		primaryBouncerInteractor =
	PrimaryBouncerInteractor(		PrimaryBouncerInteractor(
	bouncerRepository,		bouncerRepository,

services/tests/servicestests/src/com/android/server/biometrics/sensors/SensorOverlaysTest.java

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -29,7 +29,7 @@ import android.hardware.biometrics.BiometricRequestConstants;
	import android.hardware.fingerprint.ISidefpsController;		import android.hardware.fingerprint.ISidefpsController;
	import android.hardware.fingerprint.IUdfpsOverlayController;		import android.hardware.fingerprint.IUdfpsOverlayController;
	import android.platform.test.annotations.Presubmit;		import android.platform.test.annotations.Presubmit;
	import android.platform.test.annotations.RequiresFlagsDisabled;		import android.platform.test.flag.junit.SetFlagsRule;

	import androidx.test.filters.SmallTest;		import androidx.test.filters.SmallTest;

	@@ -43,10 +43,10 @@ import org.mockito.junit.MockitoRule;
	import java.util.ArrayList;		import java.util.ArrayList;
	import java.util.List;		import java.util.List;

	@RequiresFlagsDisabled(FLAG_SIDEFPS_CONTROLLER_REFACTOR)
	@Presubmit		@Presubmit
	@SmallTest		@SmallTest
	public class SensorOverlaysTest {		public class SensorOverlaysTest {
			@Rule public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();

	private static final int SENSOR_ID = 11;		private static final int SENSOR_ID = 11;
	private static final long REQUEST_ID = 8;		private static final long REQUEST_ID = 8;
	@@ -59,6 +59,7 @@ public class SensorOverlaysTest {

	@Before		@Before
	public void setup() {		public void setup() {
			mSetFlagsRule.disableFlags(FLAG_SIDEFPS_CONTROLLER_REFACTOR);
	when(mAcquisitionClient.getRequestId()).thenReturn(REQUEST_ID);		when(mAcquisitionClient.getRequestId()).thenReturn(REQUEST_ID);
	when(mAcquisitionClient.hasRequestId()).thenReturn(true);		when(mAcquisitionClient.hasRequestId()).thenReturn(true);
	}		}

services/tests/servicestests/src/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintAuthenticationClientTest.java

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -161,6 +161,7 @@ public class FingerprintAuthenticationClientTest {

	@Before		@Before
	public void setup() {		public void setup() {
			mSetFlagsRule.disableFlags(FLAG_SIDEFPS_CONTROLLER_REFACTOR);
	mContext.addMockSystemService(BiometricManager.class, mBiometricManager);		mContext.addMockSystemService(BiometricManager.class, mBiometricManager);
	when(mBiometricContext.getAuthSessionCoordinator()).thenReturn(mAuthSessionCoordinator);		when(mBiometricContext.getAuthSessionCoordinator()).thenReturn(mAuthSessionCoordinator);
	when(mBiometricLogger.getAmbientLightProbe(anyBoolean())).thenAnswer(i ->		when(mBiometricLogger.getAmbientLightProbe(anyBoolean())).thenAnswer(i ->