diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2017-05-31 07:42:12 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-05-31 07:42:12 +0000 |
| commit | 042e1158a90a79707bb6c7c09dc4c47e554ae293 (patch) | |
| tree | 66f461a7c30d0fb1b8ba7fadf68490d186329ec9 | |
| parent | 05613791421c06aefa9fe301e1751efcffb11d7c (diff) | |
| parent | 68e59d7f134381b795c0262fb629a41352081766 (diff) | |
| download | android_packages_apps_Dialer-042e1158a90a79707bb6c7c09dc4c47e554ae293.tar.gz android_packages_apps_Dialer-042e1158a90a79707bb6c7c09dc4c47e554ae293.tar.bz2 android_packages_apps_Dialer-042e1158a90a79707bb6c7c09dc4c47e554ae293.zip | |
release-request-31f776a2-f093-4abe-9235-1702f8bafc9d-for-git_oc-dr1-release-4054002 snap-temp-L42500000069020014
Change-Id: I67f0a0cfa79e1413a7cb5d5d8cce4b5cd99cc72e
| -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 1388b0133..fd38fd353 100644 --- a/Android.mk +++ b/Android.mk @@ -144,6 +144,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. @@ -430,4 +431,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( |