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

Commit 6757aed3 authored by Romain Guy's avatar Romain Guy Committed by Android Git Automerger
Browse files

am e16741b2: am 272b504e: Merge "Tame the monkey. Bug #2547546" into froyo 

Merge commit 'e16741b2' into kraken

* commit 'e16741b2':
  Tame the monkey.
parents 708a0110 e16741b2

core/java/android/app/Dialog.java

+7 −3
Original line number Diff line number Diff line
@@ -236,10 +236,14 @@ public class Dialog implements DialogInterface, Window.Callback, 
                    WindowManager.LayoutParams.SOFT_INPUT_IS_FORWARD_NAVIGATION;

            l = nl;

        }



        try {

            mWindowManager.addView(mDecor, l);

            mShowing = true;

    

            sendShowMessage();

        } finally {

        }

    }

    

    /**