diff options
| author | Jay Shrauner <shrauner@google.com> | 2015-08-04 05:00:37 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-04 05:00:37 +0000 |
| commit | 0c8c085c2f74067ee457dbb1205dd91ba940634e (patch) | |
| tree | 282d64ddcb54aa6ff5ef1403d13b09ef1626aeed /InCallUI | |
| parent | 6beea0b57ba826a076d65b033086e9596d419ed5 (diff) | |
| parent | 07364d6aade5e05a403d16a3b366085bdb2710a0 (diff) | |
am 50ccc0c6: Fix NPE in onDetailsChanged
* commit '50ccc0c6cbfc1fce25ada87da13f4e974612d2a8':
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); } } |