commit f140e67f59b9249ee8af22c17690c69e275a0301
author Jay Shrauner <shrauner@google.com> Wed May 13 21:53:31 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed May 13 21:53:31 2015 +0000
tree ccd3fe1a00ae1454ef9502309b1a9042d60f7d49
parent 601f9b39acb9115fa3de6ef73f5d2f1c5b29db61
parent 87cb16426eddbddcc9a6f6a51d8e1f70b7bb8b53

am 87cb1642: am ea4c33bc: Merge "Fix NPE in keyPressed when getView is null" into mnc-dev

* commit '87cb16426eddbddcc9a6f6a51d8e1f70b7bb8b53':
  Fix NPE in keyPressed when getView is null

src/com/android/dialer/dialpad/DialpadFragment.java

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) {