diff options
| -rw-r--r-- | Android.mk | 3 | ||||
| -rw-r--r-- | java/com/android/incallui/videotech/ims/ImsVideoTech.java | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk index f46e4d839..49cb3e47d 100644 --- a/Android.mk +++ b/Android.mk @@ -140,6 +140,7 @@ DIALER_MANIFEST_FILES += \ $(BASE_DIR)/incallui/video/protocol/AndroidManifest.xml \ $(BASE_DIR)/incallui/wifi/AndroidManifest.xml \ $(BASE_DIR)/voicemail/impl/AndroidManifest.xml \ + $(BASE_DIR)/voicemail/permissions.xml \ # Merge all manifest files. @@ -426,4 +427,4 @@ LOCAL_UNINSTALLABLE_MODULE := true include $(BUILD_PREBUILT) -include $(CLEAR_VARS)
\ No newline at end of file +include $(CLEAR_VARS) diff --git a/java/com/android/incallui/videotech/ims/ImsVideoTech.java b/java/com/android/incallui/videotech/ims/ImsVideoTech.java index 363a19397..01e4bb84c 100644 --- a/java/com/android/incallui/videotech/ims/ImsVideoTech.java +++ b/java/com/android/incallui/videotech/ims/ImsVideoTech.java @@ -183,6 +183,8 @@ public class ImsVideoTech implements VideoTech { public void stopTransmission() { LogUtil.enterBlock("ImsVideoTech.stopTransmission"); + setCamera(null); + int unpausedVideoState = getUnpausedVideoState(call.getDetails().getVideoState()); call.getVideoCall() .sendSessionModifyRequest( |