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

Commit d0de1cd1 authored by Siarhei Vishniakou's avatar Siarhei Vishniakou
Browse files

Add a null check for getWindow() 

Protect against crash surfaced by monkey, where it seems that the window
of the dialog is no longer present. If not present, don't need to post
dismiss runnable.

Bug: 124327419
Test: adb shell monkey -p com.google.android.GoogleCamera -s 999 -v 20000
Change-Id: Ic03b8501bb73725e04544fcb2397532be531988e
parent a11fb3ba

core/java/android/preference/DialogPreference.java

+20 −5
Original line number Diff line number Diff line
@@ -342,16 +342,31 @@ public abstract class DialogPreference extends Preference implements 
        dialog.show();

    }



    /**

     * Get the DecorView.

     * @return the DecorView for the current dialog window, if it exists.

     * If the window does not exist, null is returned.

     */

    private View getDecorView() {

        if (mDialog != null && mDialog.getWindow() != null) {

            return mDialog.getWindow().getDecorView();

        }

        return null;

    }



    void postDismiss() {

        removeDismissCallbacks();

        View decorView = mDialog.getWindow().getDecorView();

        View decorView = getDecorView();

        if (decorView != null) {

            // If decorView is null, dialog was already dismissed

            decorView.post(mDismissRunnable);

        }

    }



    private void removeDismissCallbacks() {

        if (mDialog != null && mDialog.getWindow() != null

                && mDialog.getWindow().getDecorView() != null) {

            mDialog.getWindow().getDecorView().removeCallbacks(mDismissRunnable);

        View decorView = getDecorView();

        if (decorView != null) {

            decorView.removeCallbacks(mDismissRunnable);

        }

    }