am 001e5242: Merge change Icccbd889 into eclair

Merge commit '001e5242c8a801664ea454a2ed6d4fddb600157a' into eclair-mr2

* commit '001e5242c8a801664ea454a2ed6d4fddb600157a':
  Fix broken handling of the BACK key in PopupWindow. Needed by Launcher2.

core/java/android/widget/PopupWindow.java

@@ -1328,7 +1328,7 @@ public class PopupWindow {
                     getKeyDispatcherState().startTracking(event, this);
                     return true;
                 } else if (event.getAction() == KeyEvent.ACTION_UP
-                        && event.isTracking() && !event.isCanceled()) {
+                        && getKeyDispatcherState().isTracking(event) && !event.isCanceled()) {
                     dismiss();
                     return true;
                 }