summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony Lee <anthonylee@google.com>2015-07-22 20:24:24 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-22 20:24:24 +0000
commit3cc9b18ecf2ff6ce1a6d440889b73ac34ba9972d (patch)
tree6ae50124a45b05f5f2544d44a501a36e703953e0
parent511805d10cc96d69f96bdb6aa3475385d53367ed (diff)
parente0e5c1ded8037b7be1712891a471b68c6e2576c3 (diff)
am 3c80805d: Catch null Call to avoid NullPointerException.
* commit '3c80805def993eef821931970723e2b927fdf552': Catch null Call to avoid NullPointerException.
-rw-r--r--InCallUI/src/com/android/incallui/VideoCallPresenter.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/InCallUI/src/com/android/incallui/VideoCallPresenter.java b/InCallUI/src/com/android/incallui/VideoCallPresenter.java
index ea0652a6d..f439f6b9d 100644
--- a/InCallUI/src/com/android/incallui/VideoCallPresenter.java
+++ b/InCallUI/src/com/android/incallui/VideoCallPresenter.java
@@ -568,6 +568,9 @@ public class VideoCallPresenter extends Presenter<VideoCallPresenter.VideoCallUi
public void onDetailsChanged(Call call, android.telecom.Call.Details details) {
Log.d(this, " onDetailsChanged call=" + call + " details=" + details + " mPrimaryCall="
+ mPrimaryCall);
+ if (call == null) {
+ return;
+ }
// If the details change is not for the currently active call no update is required.
if (!call.equals(mPrimaryCall)) {
Log.d(this," onDetailsChanged: Details not for current active call so returning. ");