diff options
| author | Jay Shrauner <shrauner@google.com> | 2015-08-04 05:06:59 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-04 05:06:59 +0000 |
| commit | 93be51ebca432d14dd47fae358ace4bf33cec12e (patch) | |
| tree | e4e6989441edb9fbce8319e95bc5188c8a0eb14b /InCallUI | |
| parent | 0aad14034911ee21c433b1aaa19a8f0703e3971d (diff) | |
| parent | 0c8c085c2f74067ee457dbb1205dd91ba940634e (diff) | |
am 4283df0c: am 50ccc0c6: Fix NPE in onDetailsChanged
* commit '4283df0c5e59792dc6d5711ea6eb91eb11d2dffd':
Fix NPE in onDetailsChanged
Diffstat (limited to 'InCallUI')
| -rw-r--r-- | InCallUI/src/com/android/incallui/CallButtonPresenter.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/InCallUI/src/com/android/incallui/CallButtonPresenter.java b/InCallUI/src/com/android/incallui/CallButtonPresenter.java index 4fc60cac8..29cdd4ddc 100644 --- a/InCallUI/src/com/android/incallui/CallButtonPresenter.java +++ b/InCallUI/src/com/android/incallui/CallButtonPresenter.java @@ -124,7 +124,8 @@ public class CallButtonPresenter extends Presenter<CallButtonPresenter.CallButto */ @Override public void onDetailsChanged(Call call, android.telecom.Call.Details details) { - if (getUi() != null && Objects.equals(call, mCall)) { + // Only update if the changes are for the currently active call + if (getUi() != null && call != null && call.equals(mCall)) { updateButtonsState(call); } } |