diff options
| author | Jay Shrauner <shrauner@google.com> | 2015-08-04 07:06:14 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-04 07:06:14 +0000 |
| commit | 2c6a72ee8f25bc7b1428bcd64e2736eb8e563fb2 (patch) | |
| tree | d4770392326a5b99863e2ecaf7b53bf957f3c655 /InCallUI | |
| parent | 5e37b15d37eca8f39e4515ba6cd7492ce8c04803 (diff) | |
| parent | 536112b45495257391e068ee8ff14d901029d189 (diff) | |
am e3648be8: am 256e4a6f: am 536a7d45: am 4283df0c: am 50ccc0c6: Fix NPE in onDetailsChanged
* commit 'e3648be86776e9319ef943a04c70ac0bb2cb5a9a':
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); } } |