summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJay Shrauner <shrauner@google.com>2015-05-13 21:28:11 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-05-13 21:28:11 +0000
commitea4c33bc813213c9e0c48c66d4c8e0d71353919f (patch)
tree7d60630027daacd1bb9c7d8af840da19ca5c4f38 /src
parentf5cffefabc793bd62937dde95420214d0eb06f75 (diff)
parentfefc60eeff8be1043d6541518b760e110a02501d (diff)
Merge "Fix NPE in keyPressed when getView is null" into mnc-dev
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) {