Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove unwanted timeout fallback to Legacy GA" am: ef21c79a70 am: 992d61b4ec

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2474825

Change-Id: Ie357d7144ef58f74f0bf6dacb2d178178da6fd6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jonathan Reichert
2023-03-20 11:57:32 +00:00
committed by Automerger Merge Worker
parent 0be446496d 992d61b4ec
commit 8766d48380
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/policy/GlobalActions.java
View File

@@ -93,7 +93,8 @@ class GlobalActions implements GlobalActionsProvider.GlobalActionsListener {
mGlobalActionsAvailable = available; mGlobalActionsAvailable = available;
if (mShowing && !mGlobalActionsAvailable) { if (mShowing && !mGlobalActionsAvailable) {
// Global actions provider died but we need to be showing global actions still, show the // 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(); ensureLegacyCreated();
mLegacyGlobalActions.showDialog(mKeyguardShowing, mDeviceProvisioned); mLegacyGlobalActions.showDialog(mKeyguardShowing, mDeviceProvisioned);
} }