diff options
| author | Jay Shrauner <shrauner@google.com> | 2015-08-04 05:16:55 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-04 05:16:55 +0000 |
| commit | f66d216fd4cd8809dfd6f3e24f79dd14e43e2d0a (patch) | |
| tree | 7315edad7b4d5bbd596a8b96b6ceec6166bb7908 /InCallUI | |
| parent | 6356f0c3d1b621c0a45142dfe4f3e29aaf1316b5 (diff) | |
| parent | 93be51ebca432d14dd47fae358ace4bf33cec12e (diff) | |
am 536a7d45: am 4283df0c: am 50ccc0c6: Fix NPE in onDetailsChanged
* commit '536a7d457a14a4deb9dee5b2cdc568fd9ec71ef9':
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); } } |