diff options
| author | Jay Shrauner <shrauner@google.com> | 2015-05-13 22:04:39 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-05-13 22:04:39 +0000 |
| commit | 849d0501597cf524b5c11738c5f04baafff65ddb (patch) | |
| tree | 1b93d840cc2f6f7e87a51719b3750c594b764f39 /src | |
| parent | 56cdfc19dc4ebdfa2c8748fe90bcf17849758127 (diff) | |
| parent | f140e67f59b9249ee8af22c17690c69e275a0301 (diff) | |
am f140e67f: am 87cb1642: am ea4c33bc: Merge "Fix NPE in keyPressed when getView is null" into mnc-dev
* commit 'f140e67f59b9249ee8af22c17690c69e275a0301':
Fix NPE in keyPressed when getView is null
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/dialer/dialpad/DialpadFragment.java | 2 |
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) { |