Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ec5ad23 authored by Jonathan Reichert's avatar Jonathan Reichert Committed by Automerger Merge Worker
Browse files

Merge "Remove unwanted timeout fallback to Legacy GA" am: ef21c79a am:... 

Merge "Remove unwanted timeout fallback to Legacy GA" am: ef21c79a am: 992d61b4 am: 8766d483 am: cc4d2be9

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



Change-Id: Ie789f454047cf11f975c6588b58b694325a4b3b3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a11067c4 cc4d2be9

services/core/java/com/android/server/policy/GlobalActions.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -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);

        }

        }