diff options
| author | Jay Shrauner <shrauner@google.com> | 2015-03-23 16:34:05 -0700 |
|---|---|---|
| committer | Jay Shrauner <shrauner@google.com> | 2015-03-25 12:49:27 -0700 |
| commit | bc01cc61a572462bf7603418011e707ed861f24e (patch) | |
| tree | 41ba5937694ed5bdf0baf23f0f974363ad45a2c6 /InCallUI | |
| parent | fd0b577edffa5413adfda1503038a3bff3247106 (diff) | |
Fix NPE in showDialpadFragment
Check for null ProximitySensor
Bug:19931065
Change-Id: I33b72552260f4b670457ea0ba6e30e5b4819f636
Diffstat (limited to 'InCallUI')
| -rw-r--r-- | InCallUI/src/com/android/incallui/InCallActivity.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/InCallUI/src/com/android/incallui/InCallActivity.java b/InCallUI/src/com/android/incallui/InCallActivity.java index 7d1059f58..5a572d583 100644 --- a/InCallUI/src/com/android/incallui/InCallActivity.java +++ b/InCallUI/src/com/android/incallui/InCallActivity.java @@ -692,7 +692,10 @@ public class InCallActivity extends Activity implements FragmentDisplayManager { mDialpadFragment.getView().startAnimation(show ? mSlideIn : mSlideOut); } - InCallPresenter.getInstance().getProximitySensor().onDialpadVisible(show); + final ProximitySensor sensor = InCallPresenter.getInstance().getProximitySensor(); + if (sensor != null) { + sensor.onDialpadVisible(show); + } } public boolean isDialpadVisible() { |