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

Commit 33cafac6 authored by The Android Open Source Project's avatar The Android Open Source Project Committed by Android Git Automerger
Browse files

am 44f9f23e: merge from open-source master

Merge commit '44f9f23ea227c62ce9250f49f5bf338cbb5f5dd7'

* commit '44f9f23ea227c62ce9250f49f5bf338cbb5f5dd7':
  Added missing media keycode (KEYCODE_MEDIA_REWIND), removed duplicate keycode (KEYCODE_MEDIA_PREVIOUS)
parents 3cdda0c3 9f686a4e
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -1647,7 +1647,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;
        }