summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony Lee <anthonylee@google.com>2015-07-24 03:02:45 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-24 03:02:45 +0000
commit96cfd4c72dced0e7e69dba4a1e476eb87dd92ec9 (patch)
treec2bb81fd794366372092cb5b5df3a2195aee7ee5
parente6ce8d2a9bfc4c42f93961f924c59b3aba40e543 (diff)
parent3cc9b18ecf2ff6ce1a6d440889b73ac34ba9972d (diff)
am 610c654b: am 3c80805d: Catch null Call to avoid NullPointerException.
* commit '610c654b5b7961d35969dcea7918be4d5a4b5043': 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. ");