commit 4950fd587f2588e7958a84c5fcd814058bd2e1a3
author Treehugger Robot <treehugger-gerrit@google.com> Tue May 22 01:02:58 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 22 01:02:58 2018 +0000
tree 7fad0655d651a9d8e0b217344d750f130a33d750
parent a4b75b5adbe4c26c83bd51cbbd89b1d029be1c18
parent 134d6b1117b086e6493e1209e26215deabbb3a72

Merge "Handle null VideoCall"

java/com/android/incallui/videotech/ims/ImsVideoTech.java

diff --git a/java/com/android/incallui/videotech/ims/ImsVideoTech.java b/java/com/android/incallui/videotech/ims/ImsVideoTech.java
index c4c177f..d35c5ef 100644
--- a/java/com/android/incallui/videotech/ims/ImsVideoTech.java
+++ b/java/com/android/incallui/videotech/ims/ImsVideoTech.java
@@ -308,6 +308,10 @@
   @Override
   public void setCamera(@Nullable String cameraId) {
     savedCameraId = cameraId;
+    if (call.getVideoCall() == null) {
+      LogUtil.w("ImsVideoTech.setCamera", "video call no longer exist");
+      return;
+    }
     call.getVideoCall().setCamera(cameraId);
     call.getVideoCall().requestCameraCapabilities();
   }