merge from open-source master

This commit is contained in:
The Android Open Source Project
2010-01-21 11:21:25 -08:00

View File

@@ -1612,7 +1612,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
code == KeyEvent.KEYCODE_MEDIA_STOP ||
code == KeyEvent.KEYCODE_MEDIA_NEXT ||
code == KeyEvent.KEYCODE_MEDIA_PREVIOUS ||
code == KeyEvent.KEYCODE_MEDIA_PREVIOUS ||
code == KeyEvent.KEYCODE_MEDIA_REWIND ||
code == KeyEvent.KEYCODE_MEDIA_FAST_FORWARD) {
return true;
}