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

Commit 5574b628 authored by Arthur Hung's avatar Arthur Hung Committed by Automerger Merge Worker
Browse files

Merge "Prevent deadlock for clearWaitingDialog" into tm-dev am: e880b639 am:... 

Merge "Prevent deadlock for clearWaitingDialog" into tm-dev am: e880b639 am: 73ece4c4 am: 75af52cc am: cb501af9

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



Change-Id: I5cd7cdb90e9b96647e5d67ebe73fa0726497c1b6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9a75fe41 cb501af9

services/core/java/com/android/server/am/ErrorDialogController.java

+2 −1
Original line number Diff line number Diff line
@@ -144,7 +144,8 @@ final class ErrorDialogController { 
        if (mWaitDialog == null) {

            return;

        }

        mWaitDialog.dismiss();

        final BaseErrorDialog dialog = mWaitDialog;

        mService.mUiHandler.post(dialog::dismiss);

        mWaitDialog = null;

    }