Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am a3b63c00: am 337756fa: am 78ad66b4: Merge "[Audio]Press camera button during Http live Audio playing, then return Browser, DUT display abnormal."

Browse Source 
* commit 'a3b63c001cfd04121708e2bd67af5c8eb855baa1':
  [Audio]Press camera button during Http live Audio playing, then return Browser, DUT display abnormal.
This commit is contained in:
Jean-Baptiste Queru
2012-08-28 11:17:48 -07:00
committed by Android Git Automerger
parent 2d27c5cb8d a3b63c001c
commit e8f24cc267
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/widget/MediaController.java
View File

@@ -477,7 +477,8 @@ public class MediaController extends FrameLayout {
return true;
} else if (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN
|| keyCode == KeyEvent.KEYCODE_VOLUME_UP
|| keyCode == KeyEvent.KEYCODE_VOLUME_MUTE) {
|| keyCode == KeyEvent.KEYCODE_VOLUME_MUTE
|| keyCode == KeyEvent.KEYCODE_CAMERA) {
// don't show the controls for volume adjustment
return super.dispatchKeyEvent(event);
} else if (keyCode == KeyEvent.KEYCODE_BACK || keyCode == KeyEvent.KEYCODE_MENU) {