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

Commit d2ce8bbb authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

Make Activity.removeDialog() less strict. 

It was extremely annoying not being able to do this.

Change-Id: I9a13b4fdd984a5e9d8f9ac49c7ede218c4481c2b
parent ef083ec0

core/java/android/app/Activity.java

+10 −10
Original line number Diff line number Diff line
@@ -2609,6 +2609,10 @@ public class Activity extends ContextThemeWrapper 
     * <p>This can be useful if you know that you will never show a dialog again and

     * want to avoid the overhead of saving and restoring it in the future.

     *

     * <p>As of {@link android.os.Build.VERSION_CODES#GINGERBREAD}, this function

     * will not throw an exception if you try to remove an ID that does not

     * currently have an associated dialog.</p>

     * 

     * @param id The id of the managed dialog.

     *

     * @see #onCreateDialog(int, Bundle)
@@ -2617,18 +2621,14 @@ public class Activity extends ContextThemeWrapper 
     * @see #dismissDialog(int)

     */

    public final void removeDialog(int id) {

        if (mManagedDialogs == null) {

            return;

        }



        if (mManagedDialogs != null) {

            final ManagedDialog md = mManagedDialogs.get(id);

        if (md == null) {

            return;

        }



            if (md != null) {

                md.mDialog.dismiss();

                mManagedDialogs.remove(id);

            }

        }

    }



    /**

     * This hook is called when the user signals the desire to start a search.