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 | 4283df0c5e59792dc6d5711ea6eb91eb11d2dffd (patch) | |
| tree | 430dbcdc77fca0f63ebc85ea31697f563b6bb8f3 | |
| parent | 1480c09d957c2d535b240f44d3be6639700d03e7 (diff) | |
| parent | 50ccc0c6cbfc1fce25ada87da13f4e974612d2a8 (diff) | |
| download | InCallUI-4283df0c5e59792dc6d5711ea6eb91eb11d2dffd.tar.gz | |
am 50ccc0c6: Fix NPE in onDetailsChanged
* commit '50ccc0c6cbfc1fce25ada87da13f4e974612d2a8':
Fix NPE in onDetailsChanged
| -rw-r--r-- | src/com/android/incallui/CallButtonPresenter.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/incallui/CallButtonPresenter.java b/src/com/android/incallui/CallButtonPresenter.java index 4fc60cac..29cdd4dd 100644 --- a/src/com/android/incallui/CallButtonPresenter.java +++ b/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); } } |