summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony Lee <anthonylee@google.com>2015-07-24 04:08:52 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-24 04:08:52 +0000
commit956e33123bbc4096098c0848fe61ed7ceb035cbe (patch)
treef13537e045df6865ce395c06cae37dc1680c0aa4
parentd76582326e81d3a9950c2fcee2e5bd9ca6b9421e (diff)
parent5053e7ba1df53a25379d8a62be4e58ee43d8c691 (diff)
am 55518649: am efe0226a: am 610c654b: am 3c80805d: Catch null Call to avoid NullPointerException.
* commit '555186493768cdb1722ed2354b9ed3bebde9f1c9': 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. ");