commit b644c3dccb5331641fb6e1166320d45b6acbb740
author Yorke Lee <yorkelee@google.com> Thu Oct 08 22:08:13 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Oct 08 22:08:13 2015 +0000
tree 1459ea66c024d5ab199eb6d10b71206d482e3ac9
parent 0de21104d5ca7aca9b1e3a092a706d0bffcf90b3
parent e5d18339a614b2921a22f304659560d2b50b70e3

am e5d18339: Merge "Cannot input the DTMF number from Bluetooth device"

* commit 'e5d18339a614b2921a22f304659560d2b50b70e3':
  Cannot input the DTMF number from Bluetooth device

src/com/android/incallui/DialpadFragment.java

diff --git a/src/com/android/incallui/DialpadFragment.java b/src/com/android/incallui/DialpadFragment.java
index abe8fb9..371f5c5 100644
--- a/src/com/android/incallui/DialpadFragment.java
+++ b/src/com/android/incallui/DialpadFragment.java
@@ -361,7 +361,7 @@
     public boolean onKey(View v, int keyCode, KeyEvent event) {
         Log.d(this, "onKey:  keyCode " + keyCode + ", view " + v);
 
-        if (keyCode == KeyEvent.KEYCODE_DPAD_CENTER) {
+        if (keyCode == KeyEvent.KEYCODE_DPAD_CENTER || keyCode == KeyEvent.KEYCODE_ENTER) {
             int viewId = v.getId();
             if (mDisplayMap.containsKey(viewId)) {
                 switch (event.getAction()) {