summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJay Shrauner <shrauner@google.com>2015-08-03 16:57:32 -0700
committerJay Shrauner <shrauner@google.com>2015-08-03 17:03:22 -0700
commit50ccc0c6cbfc1fce25ada87da13f4e974612d2a8 (patch)
tree9e901fccc21dd323b98843dcf8cf36284d9f1fe7
parentf8f94b2f55f9c63280aceb08876d9e02f90a6f71 (diff)
downloadInCallUI-50ccc0c6cbfc1fce25ada87da13f4e974612d2a8.tar.gz
Fix NPE in onDetailsChanged
Bug:22925987 Change-Id: I20ad0ea5e40342805a2004654e6b78f420c33873
-rw-r--r--src/com/android/incallui/CallButtonPresenter.java3
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);
}
}