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

Commit d680fe76 authored by Nicolo' Mazzucato's avatar Nicolo' Mazzucato
Browse files

Annotate resources in biometrics package 

This adds @Main as some injected context, resources and configuration related classes.

FingerprintPropertyInteractor was annotated with ShadeDisplaysAware wrongly (as it's only supposed to be on the default display.

Bug: 362719719
Bug: 374267505
Test: presubmits
Flag: com.android.systemui.shade_window_goes_around
Change-Id: Ib7d824bc75e20c07e2ef02a78bc319bd76df9c32
parent 498204fc

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

+2 −2
Original line number Diff line number Diff line
@@ -714,12 +714,12 @@ public class AuthController implements 
        onDialogDismissed(reason);

    }

    @Inject

    public AuthController(Context context,

    public AuthController(@Main Context context,

            @Application CoroutineScope applicationCoroutineScope,

            Execution execution,

            CommandQueue commandQueue,

            ActivityTaskManager activityTaskManager,

            @NonNull WindowManager windowManager,

            @NonNull @Main WindowManager windowManager,

            @Nullable FingerprintManager fingerprintManager,

            @Nullable FaceManager faceManager,

            Optional<AuthContextPlugins> contextPlugins,

packages/SystemUI/src/com/android/systemui/biometrics/AuthRippleController.kt

+3 −2
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ import com.android.systemui.Flags.lightRevealMigration 
import com.android.systemui.biometrics.data.repository.FacePropertyRepository

import com.android.systemui.biometrics.shared.model.UdfpsOverlayParams

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.dagger.qualifiers.Main

import com.android.systemui.deviceentry.domain.interactor.AuthRippleInteractor

import com.android.systemui.keyguard.WakefulnessLifecycle

import com.android.systemui.keyguard.shared.model.BiometricUnlockSource
@@ -69,9 +70,9 @@ import javax.inject.Provider 
class AuthRippleController

@Inject

constructor(

    private val sysuiContext: Context,

    @Main private val sysuiContext: Context,

    private val authController: AuthController,

    private val configurationController: ConfigurationController,

    @Main private val configurationController: ConfigurationController,

    private val keyguardUpdateMonitor: KeyguardUpdateMonitor,

    private val keyguardStateController: KeyguardStateController,

    private val wakefulnessLifecycle: WakefulnessLifecycle,

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

+2 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.content.Intent; 
import android.hardware.biometrics.BiometricSourceType;



import com.android.systemui.dagger.SysUISingleton;

import com.android.systemui.dagger.qualifiers.Main;



import javax.inject.Inject;
@@ -43,7 +44,7 @@ public class BiometricNotificationBroadcastReceiver extends BroadcastReceiver { 
    private final BiometricNotificationDialogFactory mNotificationDialogFactory;

    @Inject

    BiometricNotificationBroadcastReceiver(

            Context context,

            @Main Context context,

            BiometricNotificationDialogFactory notificationDialogFactory) {

        mContext = context;

        mNotificationDialogFactory = notificationDialogFactory;

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

+2 −1
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ import com.android.keyguard.KeyguardUpdateMonitor; 
import com.android.keyguard.KeyguardUpdateMonitorCallback;

import com.android.systemui.CoreStartable;

import com.android.systemui.dagger.SysUISingleton;

import com.android.systemui.dagger.qualifiers.Main;

import com.android.systemui.res.R;

import com.android.systemui.statusbar.policy.KeyguardStateController;
@@ -145,7 +146,7 @@ public class BiometricNotificationService implements CoreStartable { 
    };



    @Inject

    public BiometricNotificationService(@NonNull Context context,

    public BiometricNotificationService(@NonNull @Main Context context,

            @NonNull KeyguardUpdateMonitor keyguardUpdateMonitor,

            @NonNull KeyguardStateController keyguardStateController,

            @NonNull Handler handler, @NonNull NotificationManager notificationManager,

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

+2 −2
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ import com.android.systemui.biometrics.shared.model.SensorLocation 
import com.android.systemui.common.ui.domain.interactor.ConfigurationInteractor

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.dagger.qualifiers.Application

import com.android.systemui.shade.ShadeDisplayAware

import com.android.systemui.dagger.qualifiers.Main

import javax.inject.Inject

import kotlinx.coroutines.CoroutineScope

import kotlinx.coroutines.flow.Flow
@@ -43,7 +43,7 @@ constructor( 
    @Application private val applicationScope: CoroutineScope,

    @Application private val context: Context,

    repository: FingerprintPropertyRepository,

    @ShadeDisplayAware configurationInteractor: ConfigurationInteractor,

    @Main configurationInteractor: ConfigurationInteractor,

    displayStateInteractor: DisplayStateInteractor,

    udfpsOverlayInteractor: UdfpsOverlayInteractor,

) {