Merge "Make KeyguardUpdateMonitor#registerCallback in... (af856965) · Commits · e / os / android_frameworks_base

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/policy/KeyguardStateControllerTest.java

+7 −2

Original line number	Diff line number	Diff line
		@@ -33,13 +33,15 @@ import androidx.test.filters.SmallTest;
		import com.android.internal.widget.LockPatternUtils;
		import com.android.keyguard.KeyguardUpdateMonitor;
		import com.android.keyguard.KeyguardUpdateMonitorCallback;
		import com.android.systemui.keyguard.domain.interactor.KeyguardInteractor;
		import com.android.keyguard.logging.KeyguardUpdateMonitorLogger;
		import com.android.systemui.SysuiTestCase;
		import com.android.systemui.dump.DumpManager;
		import com.android.systemui.flags.FeatureFlags;
		import com.android.systemui.keyguard.KeyguardUnlockAnimationController;
		import com.android.systemui.keyguard.domain.interactor.KeyguardInteractor;
		import com.android.systemui.user.domain.interactor.SelectedUserInteractor;
		import com.android.systemui.util.concurrency.FakeExecutor;
		import com.android.systemui.util.time.FakeSystemClock;

		import dagger.Lazy;

		@@ -82,6 +84,7 @@ public class KeyguardStateControllerTest extends SysuiTestCase {
		@Before
		public void setup() {
		MockitoAnnotations.initMocks(this);
		FakeExecutor mainExecutor = new FakeExecutor(new FakeSystemClock());
		mKeyguardStateController = new KeyguardStateControllerImpl(
		mContext,
		mKeyguardUpdateMonitor,
		@@ -91,7 +94,9 @@ public class KeyguardStateControllerTest extends SysuiTestCase {
		mDumpManager,
		mKeyguardInteractorLazy,
		mFeatureFlags,
		mSelectedUserInteractor);
		mSelectedUserInteractor,
		mainExecutor);
		mainExecutor.runAllReady();
		}

		@Test

packages/SystemUI/src/com/android/systemui/display/data/repository/DisplayComponentRepository.kt

+2 −1

Original line number	Diff line number	Diff line
		@@ -25,6 +25,7 @@ import com.android.app.tracing.ListenersTracing.forEachTraced
		import com.android.app.tracing.traceSection
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.display.dagger.SystemUIDisplaySubcomponent
		import com.android.systemui.display.flags.DisplayComponentRepositoryFlag.isEagerInitializationEnabled
		import dagger.Module
		import dagger.Provides
		import javax.inject.Inject
		@@ -84,7 +85,7 @@ object DisplayComponentRepository {
		return repositoryFactory.create(
		debugName = "DisplayComponentInstanceProvider",
		instanceProvider,
		createInstanceEagerly = true,
		createInstanceEagerly = isEagerInitializationEnabled(),
		)
		}
		}

packages/SystemUI/src/com/android/systemui/display/flags/DisplayComponentRepositoryFlag.kt

0 → 100644

+29 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2025 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.systemui.display.flags

		import com.android.window.flags.Flags

		/** Flags related to [com.android.systemui.display.data.repository.DisplayComponentRepository]. */
		object DisplayComponentRepositoryFlag {
		/**
		* Returns true if eager initialization should be enabled for
		* [com.android.systemui.display.data.repository.DisplayComponentRepository].
		*/
		fun isEagerInitializationEnabled(): Boolean =
		Flags.enableConnectedDisplaysWallpaperPresentations()
		}

packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardStateControllerImpl.java

+11 −2

Original line number	Diff line number	Diff line
		@@ -38,6 +38,8 @@ import com.android.keyguard.KeyguardUpdateMonitor;
		import com.android.keyguard.KeyguardUpdateMonitorCallback;
		import com.android.keyguard.logging.KeyguardUpdateMonitorLogger;
		import com.android.systemui.dagger.SysUISingleton;
		import com.android.systemui.dagger.qualifiers.Main;
		import com.android.systemui.display.flags.DisplayComponentRepositoryFlag;
		import com.android.systemui.dump.DumpManager;
		import com.android.systemui.flags.FeatureFlags;
		import com.android.systemui.keyguard.KeyguardUnlockAnimationController;
		@@ -50,6 +52,7 @@ import dagger.Lazy;
		import java.io.PrintWriter;
		import java.util.Objects;
		import java.util.concurrent.ConcurrentHashMap;
		import java.util.concurrent.Executor;
		import java.util.function.Consumer;

		import javax.inject.Inject;
		@@ -128,13 +131,19 @@ public class KeyguardStateControllerImpl implements KeyguardStateController {
		DumpManager dumpManager,
		Lazy<KeyguardInteractor> keyguardInteractor,
		FeatureFlags featureFlags,
		SelectedUserInteractor userInteractor) {
		SelectedUserInteractor userInteractor,
		@Main Executor mainExecutor) {
		mContext = context;
		mLogger = logger;
		mKeyguardUpdateMonitor = keyguardUpdateMonitor;
		mLockPatternUtils = lockPatternUtils;
		mUserInteractor = userInteractor;
		if (DisplayComponentRepositoryFlag.INSTANCE.isEagerInitializationEnabled()) {
		mainExecutor.execute(
		() -> mKeyguardUpdateMonitor.registerCallback(mKeyguardUpdateMonitorCallback));
		} else {
		mKeyguardUpdateMonitor.registerCallback(mKeyguardUpdateMonitorCallback);
		}
		mUnlockAnimationControllerLazy = keyguardUnlockAnimationController;
		mFeatureFlags = featureFlags;
		mKeyguardInteractorLazy = keyguardInteractor;