| commit | 9a6afa3ae2bfc0074f7f64a7ec3238c26e913c3c | [log] [tgz] |
|---|---|---|
| author | Eric Erfanian <erfanian@google.com> | Thu Aug 03 11:34:42 2017 -0700 |
| committer | Eric Erfanian <erfanian@google.com> | Fri Aug 11 19:33:20 2017 +0000 |
| tree | 7f98300ff2318f2eefb50d84ca2701a416590fb4 | |
| parent | ff2ad7ffdba7c74077eae3016b32174f0f2dad30 [diff] [blame] |
Update oc-dr1-dev to v11.1 RC06 This moves the branch forward from v11 RC17. This release contains fixes for the following bugs: Bug: 63584851 63803282 63917358 64099380 64101648 64105912 64119808 64122858 64125770 64300111 Test: TH, on device Merged-In: I858e3665253139b8aab4e4c063bfc4c419f33cc9 Merged-In: Ifc146f2fec24fd2f8a51cd32feb3699bb1c07136 Change-Id: I48296c56fb1d275a06b7c314f5380266c1195ef2
diff --git a/java/com/android/incallui/VideoCallPresenter.java b/java/com/android/incallui/VideoCallPresenter.java index a106022..5b4178d 100644 --- a/java/com/android/incallui/VideoCallPresenter.java +++ b/java/com/android/incallui/VideoCallPresenter.java
@@ -867,7 +867,7 @@ false /* isRemotelyHeld */); enableCamera(mVideoCall, false); InCallPresenter.getInstance().setFullScreen(false); - + InCallPresenter.getInstance().enableScreenTimeout(false); mIsVideoMode = false; }