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

Commit af2113a2 authored by William Xiao's avatar William Xiao Committed by Bryce Lee
Browse files

Resolve circular dependency 

This resolves circular dependencies between keyguard and commuanl code
due to KeyguardUpdateMonitor's dependency on CommunalSceneInteractor.

Bug: 378170118
Test: local build
Flag: com.android.systemui.glanceable_hub_v2
Change-Id: Iaa9f674374998844286948c323255139121ca296
parent 31719bf9

packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java

+3 −3
Original line number Diff line number Diff line
@@ -296,7 +296,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
    private final Provider<JavaAdapter> mJavaAdapter;

    private final Provider<SceneInteractor> mSceneInteractor;

    private final Provider<AlternateBouncerInteractor> mAlternateBouncerInteractor;

    private final CommunalSceneInteractor mCommunalSceneInteractor;

    private final Provider<CommunalSceneInteractor> mCommunalSceneInteractor;

    private final AuthController mAuthController;

    private final UiEventLogger mUiEventLogger;

    private final Set<String> mAllowFingerprintOnOccludingActivitiesFromPackage;
@@ -2210,7 +2210,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
            Provider<AlternateBouncerInteractor> alternateBouncerInteractor,

            Provider<JavaAdapter> javaAdapter,

            Provider<SceneInteractor> sceneInteractor,

            CommunalSceneInteractor communalSceneInteractor) {

            Provider<CommunalSceneInteractor> communalSceneInteractor) {

        mContext = context;

        mSubscriptionManager = subscriptionManager;

        mUserTracker = userTracker;
@@ -2543,7 +2543,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 


        if (glanceableHubV2()) {

            mJavaAdapter.get().alwaysCollectFlow(

                    mCommunalSceneInteractor.isCommunalVisible(),

                    mCommunalSceneInteractor.get().isCommunalVisible(),

                    this::onCommunalShowingChanged

            );

        }

packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java

+1 −2
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.keyguard; 


import static android.app.StatusBarManager.SESSION_KEYGUARD;

import static android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD;

import static android.hardware.biometrics.BiometricAuthenticator.TYPE_ANY_BIOMETRIC;

import static android.hardware.biometrics.BiometricAuthenticator.TYPE_FACE;

import static android.hardware.biometrics.BiometricAuthenticator.TYPE_FINGERPRINT;

import static android.hardware.biometrics.BiometricFaceConstants.FACE_ERROR_LOCKOUT_PERMANENT;
@@ -2717,7 +2716,7 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { 
                    () -> mAlternateBouncerInteractor,

                    () -> mJavaAdapter,

                    () -> mSceneInteractor,

                    mCommunalSceneInteractor);

                    () -> mCommunalSceneInteractor);

            setAlternateBouncerVisibility(false);

            setPrimaryBouncerVisibility(false);

            setStrongAuthTracker(KeyguardUpdateMonitorTest.this.mStrongAuthTracker);