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

Commit ec60591e authored by Ricardo Cerqueira's avatar Ricardo Cerqueira
Browse files

GlobalActions: Fix dialog dismissal 

The themeability of the global actions dialog introduced by
change I644e2e8d7d4abf07bae639b606197d691f16adac broke the
hook that prevented multiple instances of that dialog, and
multiple instances of it will cause framework crashes due to
mismatches variable references (besides looking weird).

Fix it by restoring the original dismissal condition and forcing
a recreation of the theme context if necessary.

Change-Id: Ic6e06bef18fa9e09c84c774fa273f1b7e3bf9630
parent e760ae58

policy/src/com/android/internal/policy/impl/GlobalActions.java

+4 −1
Original line number Diff line number Diff line
@@ -167,7 +167,10 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac 
    public void showDialog(boolean keyguardShowing, boolean isDeviceProvisioned) {

        mKeyguardShowing = keyguardShowing;

        mDeviceProvisioned = isDeviceProvisioned;

        if (mDialog != null && mUiContext == null) {

        if (mDialog != null) {

            if (mUiContext != null) {

                mUiContext = null;

            }

            mDialog.dismiss();

            mDialog = null;

            // Show delayed, so that the dismiss of the previous dialog completes