diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2017-05-28 07:25:49 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-05-28 07:25:49 +0000 |
| commit | d890445edf0221fb4e2647c421e5dd6ea4d72492 (patch) | |
| tree | 8b3be2ccca476c994e34ed9d8d32481ea43d37dc | |
| parent | 004c13cd5c5bfd7d426826f6cebfb07f7b9b86a1 (diff) | |
| parent | d40e05b9e0d8331a01af64e37730d177b9b948d5 (diff) | |
| download | android_packages_apps_Dialer-d890445edf0221fb4e2647c421e5dd6ea4d72492.tar.gz android_packages_apps_Dialer-d890445edf0221fb4e2647c421e5dd6ea4d72492.tar.bz2 android_packages_apps_Dialer-d890445edf0221fb4e2647c421e5dd6ea4d72492.zip | |
release-request-fca2b5ac-03eb-4055-a549-b4fc2b292b64-for-git_oc-release-4049993 snap-temp-L04900000068539456
Change-Id: I79e35392ed1dd850cbdc8b7afac1e064bbb06ee1
| -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( |