| commit | ea4c33bc813213c9e0c48c66d4c8e0d71353919f | [log] [tgz] |
|---|---|---|
| author | Jay Shrauner <shrauner@google.com> | Wed May 13 21:28:11 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed May 13 21:28:11 2015 +0000 |
| tree | 7d60630027daacd1bb9c7d8af840da19ca5c4f38 | |
| parent | f5cffefabc793bd62937dde95420214d0eb06f75 [diff] | |
| parent | fefc60eeff8be1043d6541518b760e110a02501d [diff] |
Merge "Fix NPE in keyPressed when getView is null" into mnc-dev
diff --git a/src/com/android/dialer/dialpad/DialpadFragment.java b/src/com/android/dialer/dialpad/DialpadFragment.java index 229af38..a1ba150 100644 --- a/src/com/android/dialer/dialpad/DialpadFragment.java +++ b/src/com/android/dialer/dialpad/DialpadFragment.java
@@ -722,7 +722,7 @@ } private void keyPressed(int keyCode) { - if (getView().getTranslationY() != 0) { + if (getView() == null || getView().getTranslationY() != 0) { return; } switch (keyCode) {