summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJay Shrauner <shrauner@google.com>2015-05-13 21:53:31 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-05-13 21:53:31 +0000
commitf140e67f59b9249ee8af22c17690c69e275a0301 (patch)
treeccd3fe1a00ae1454ef9502309b1a9042d60f7d49 /src
parent601f9b39acb9115fa3de6ef73f5d2f1c5b29db61 (diff)
parent87cb16426eddbddcc9a6f6a51d8e1f70b7bb8b53 (diff)
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
Diffstat (limited to 'src')
-rw-r--r--src/com/android/dialer/dialpad/DialpadFragment.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/dialer/dialpad/DialpadFragment.java b/src/com/android/dialer/dialpad/DialpadFragment.java
index 229af389a..a1ba15087 100644
--- a/src/com/android/dialer/dialpad/DialpadFragment.java
+++ b/src/com/android/dialer/dialpad/DialpadFragment.java
@@ -722,7 +722,7 @@ public class DialpadFragment extends Fragment
}
private void keyPressed(int keyCode) {
- if (getView().getTranslationY() != 0) {
+ if (getView() == null || getView().getTranslationY() != 0) {
return;
}
switch (keyCode) {