From 4d705e558d25a8fd810cb551c43c5a517cd1c2b9 Mon Sep 17 00:00:00 2001
From: wangqi <wangqi@google.com>
Date: Thu, 28 Sep 2017 12:23:35 -0700
Subject: Fix crash on hanging up simulator video call.

The problem is that InCallActivityCommon#onStop will try to commit any fragment which will crash.

This change also fix a bug that simulatorRemoteVideo is not stopped after hanging up.

Bug: 67045513
Test: manual
PiperOrigin-RevId: 170380589
Change-Id: I25e0f43141eaa573189f4d9c0109fd2689c10374
---
 java/com/android/dialer/simulator/impl/SimulatorVideoProvider.java | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'java/com/android/dialer/simulator')

diff --git a/java/com/android/dialer/simulator/impl/SimulatorVideoProvider.java b/java/com/android/dialer/simulator/impl/SimulatorVideoProvider.java
index a596728a8..0ed81da28 100644
--- a/java/com/android/dialer/simulator/impl/SimulatorVideoProvider.java
+++ b/java/com/android/dialer/simulator/impl/SimulatorVideoProvider.java
@@ -52,6 +52,10 @@ final class SimulatorVideoProvider extends Connection.VideoProvider {
       simulatorPreviewCamera.stopCamera();
       simulatorPreviewCamera = null;
     }
+    if (previewCameraId == null && simulatorRemoteVideo != null) {
+      simulatorRemoteVideo.stopVideo();
+      simulatorRemoteVideo = null;
+    }
   }
 
   @Override
-- 
cgit v1.2.3