Merge cherrypicks of ['googleplex-android-review.googlesource.com/23898911',... (b0ceef62) · Commits · e / os / android_frameworks_base

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

+13 −8

Original line number	Diff line number	Diff line
		@@ -4481,7 +4481,10 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
		* Cancels all operations in the scheduler if it is hung for 10 seconds.
		*/
		public void startBiometricWatchdog() {
		if (mFaceManager != null && !isFaceAuthInteractorEnabled()) {
		final boolean isFaceAuthInteractorEnabled = isFaceAuthInteractorEnabled();
		mBackgroundExecutor.execute(() -> {
		Trace.beginSection("#startBiometricWatchdog");
		if (mFaceManager != null && !isFaceAuthInteractorEnabled) {
		mLogger.scheduleWatchdog("face");
		mFaceManager.scheduleWatchdog();
		}
		@@ -4489,5 +4492,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
		mLogger.scheduleWatchdog("fingerprint");
		mFpm.scheduleWatchdog();
		}
		Trace.endSection();
		});
		}
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -683,11 +683,11 @@ object Flags {
		// TODO(b/283071711): Tracking bug
		@JvmField
		val TRIM_RESOURCES_WITH_BACKGROUND_TRIM_AT_LOCK =
		releasedFlag(2401, "trim_resources_with_background_trim_on_lock")
		unreleasedFlag(2401, "trim_resources_with_background_trim_on_lock")

		// TODO:(b/283203305): Tracking bug
		@JvmField
		val TRIM_FONT_CACHES_AT_UNLOCK = releasedFlag(2402, "trim_font_caches_on_unlock")
		val TRIM_FONT_CACHES_AT_UNLOCK = unreleasedFlag(2402, "trim_font_caches_on_unlock")

		// 2700 - unfold transitions
		// TODO(b/265764985): Tracking Bug

+8 −2

Original line number	Diff line number	Diff line
		@@ -30,6 +30,7 @@ import com.android.systemui.common.coroutine.ChannelExt.trySendWithFailureLoggin
		import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.dagger.qualifiers.Application
		import com.android.systemui.dagger.qualifiers.Background
		import com.android.systemui.dagger.qualifiers.Main
		import com.android.systemui.dump.DumpManager
		import com.android.systemui.flags.FeatureFlags
		@@ -126,6 +127,7 @@ constructor(
		private val keyguardBypassController: KeyguardBypassController? = null,
		@Application private val applicationScope: CoroutineScope,
		@Main private val mainDispatcher: CoroutineDispatcher,
		@Background private val backgroundDispatcher: CoroutineDispatcher,
		private val sessionTracker: SessionTracker,
		private val uiEventsLogger: UiEventLogger,
		private val faceAuthLogger: FaceAuthenticationLogger,
		@@ -228,9 +230,13 @@ constructor(
		keyguardTransitionInteractor.anyStateToGoneTransition
		.filter { it.transitionState == TransitionState.FINISHED }
		.onEach {
		// We deliberately want to run this in background because scheduleWatchdog does
		// a Binder IPC.
		withContext(backgroundDispatcher) {
		faceAuthLogger.watchdogScheduled()
		faceManager?.scheduleWatchdog()
		}
		}
		.launchIn(applicationScope)
		}

+1 −0

Original line number	Diff line number	Diff line
		@@ -223,6 +223,7 @@ class DeviceEntryFaceAuthRepositoryTest : SysuiTestCase() {
		bypassControllerOverride,
		testScope.backgroundScope,
		testDispatcher,
		testDispatcher,
		sessionTracker,
		uiEventLogger,
		FaceAuthenticationLogger(logcatLogBuffer("DeviceEntryFaceAuthRepositoryLog")),

+1 −1

Original line number	Diff line number	Diff line
		@@ -7000,7 +7000,7 @@ public class NotificationManagerService extends SystemService {
		*/
		private boolean canBeNonDismissible(ApplicationInfo ai, Notification notification) {
		return notification.isMediaNotification() \|\| isEnterpriseExempted(ai)
		\|\| isCallNotification(ai.packageName, ai.uid, notification)
		\|\| notification.isStyle(Notification.CallStyle.class)
		\|\| isDefaultSearchSelectorPackage(ai.packageName);
		}