From f3e4ca6dd0ace5cf63269c06a0de618c915587e3 Mon Sep 17 00:00:00 2001 From: Fabio Iannaccone Date: Tue, 7 Mar 2023 14:39:51 -0300 Subject: [PATCH] Remove unwanted timeout fallback to Legacy GA When Provider dies, remove timer callback to avoid secondary timeout fallback to Legacy GA that was leading to the dialog box blinking. Bug: 272173191 Test: manual Change-Id: Ie8d8dda855324a49c6b03e8d5f382f8d911050ba Signed-off-by: Fabio Iannaccone --- .../core/java/com/android/server/policy/GlobalActions.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/policy/GlobalActions.java b/services/core/java/com/android/server/policy/GlobalActions.java index e1461356cc4c0..76a714c47f2ef 100644 --- a/services/core/java/com/android/server/policy/GlobalActions.java +++ b/services/core/java/com/android/server/policy/GlobalActions.java @@ -93,7 +93,8 @@ class GlobalActions implements GlobalActionsProvider.GlobalActionsListener { mGlobalActionsAvailable = available; if (mShowing && !mGlobalActionsAvailable) { // Global actions provider died but we need to be showing global actions still, show the - // legacy global acrions provider. + // legacy global actions provider and remove timeout callbacks to avoid legacy re-show. + mHandler.removeCallbacks(mShowTimeout); ensureLegacyCreated(); mLegacyGlobalActions.showDialog(mKeyguardShowing, mDeviceProvisioned); }