Merge "Move notifying powerManager userActivity to background thread" into main (0b923ad8) · Commits · e / os / android_frameworks_base

packages/SystemUI/aconfig/systemui.aconfig

+10 −0

Original line number	Diff line number	Diff line
		@@ -546,3 +546,13 @@ flag {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "notify_power_manager_user_activity_background"
		namespace: "systemui"
		description: "Decide whether to notify the user activity to power manager in the background thread."
		bug: "325203885"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

+6 −1

Original line number	Diff line number	Diff line
		@@ -40,6 +40,7 @@ import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.STR
		import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_USER_LOCKDOWN;
		import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_FOR_UNATTENDED_UPDATE;
		import static com.android.systemui.DejankUtils.whitelistIpcs;
		import static com.android.systemui.Flags.notifyPowerManagerUserActivityBackground;
		import static com.android.systemui.Flags.refactorGetCurrentUser;
		import static com.android.systemui.keyguard.ui.viewmodel.LockscreenToDreamingTransitionViewModel.DREAMING_ANIMATION_DURATION_MS;
		import static com.android.systemui.util.kotlin.JavaAdapterKt.collectFlow;
		@@ -1488,8 +1489,12 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable,
		}

		public void userActivity() {
		if (notifyPowerManagerUserActivityBackground()) {
		mUiBgExecutor.execute(() -> mPM.userActivity(mSystemClock.uptimeMillis(), false));
		} else {
		mPM.userActivity(mSystemClock.uptimeMillis(), false);
		}
		}

		private void setupLocked() {
		IntentFilter filter = new IntentFilter();