Merge "return false for media keys if no controller" into lmp-dev

2014-07-17 19:50:25 +00:00
parent 7040e9f7fe 28204a768e
commit 69b86207bf
1 changed files with 2 additions and 0 deletions
--- a/policy/src/com/android/internal/policy/impl/PhoneWindow.java
+++ b/policy/src/com/android/internal/policy/impl/PhoneWindow.java
@@ -1729,6 +1729,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
                        return true;
                    }
                }
+                return false;
            }

            case KeyEvent.KEYCODE_MENU: {
@@ -1822,6 +1823,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
                        return true;
                    }
                }
+                return false;
            }

            case KeyEvent.KEYCODE_MENU: {