summaryrefslogtreecommitdiff
path: root/java/com/android/dialer/simulator
diff options
context:
space:
mode:
authorwangqi <wangqi@google.com>2017-09-28 12:23:35 -0700
committerEric Erfanian <erfanian@google.com>2017-10-02 14:56:37 -0700
commit4d705e558d25a8fd810cb551c43c5a517cd1c2b9 (patch)
tree62e9f38f107a3a0021c2454bda23a3da5c06f43d /java/com/android/dialer/simulator
parent43d73dfdbda67ed9f405fa15e303643d97d33b70 (diff)
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
Diffstat (limited to 'java/com/android/dialer/simulator')
-rw-r--r--java/com/android/dialer/simulator/impl/SimulatorVideoProvider.java4
1 files changed, 4 insertions, 0 deletions
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