summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnthony Lee <anthonylee@google.com>2015-07-24 03:41:26 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-24 03:41:26 +0000
commit555186493768cdb1722ed2354b9ed3bebde9f1c9 (patch)
tree26df3fc7c28b545f9d4b3f7dcb0195ec0cdc081f
parentf276882cb2ffb55f4e9c16cc55b5ef21c3a6d488 (diff)
parentefe0226a492cdd872bc7815a15fd965bcc10513d (diff)
downloadandroid_packages_apps_InCallUI-555186493768cdb1722ed2354b9ed3bebde9f1c9.tar.gz
android_packages_apps_InCallUI-555186493768cdb1722ed2354b9ed3bebde9f1c9.tar.bz2
android_packages_apps_InCallUI-555186493768cdb1722ed2354b9ed3bebde9f1c9.zip
am efe0226a: am 610c654b: am 3c80805d: Catch null Call to avoid NullPointerException.
* commit 'efe0226a492cdd872bc7815a15fd965bcc10513d': Catch null Call to avoid NullPointerException.
-rw-r--r--src/com/android/incallui/VideoCallPresenter.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/incallui/VideoCallPresenter.java b/src/com/android/incallui/VideoCallPresenter.java
index ea0652a6..f439f6b9 100644
--- a/src/com/android/incallui/VideoCallPresenter.java
+++ b/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. ");