Remove one shot callback workaround in VideoModule for L

Since there was a framework fix for the issue, we don't need
to do an extra preview callback when entering video if on L.

Bug: 16649297
Bug: 17241994
Change-Id: I67fc67ef34a661daea6991c3b895b1c1bf6b9b85

1 files changed, 7 insertions, 2 deletions

diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index d2619baab..27c9cdba7 100644
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -927,8 +927,13 @@ public class VideoModule extends CameraModule
         // controller can set preview callbacks if needed. This has to happen before
         // preview is started as a workaround of the framework issue related to preview
         // callbacks that causes preview stretch and crash. (More details see b/12210027
-        // and b/12591410
-        mAppController.onPreviewReadyToStart();
+        // and b/12591410. Don't apply this to L, see b/16649297.
+        if (!ApiHelper.isLOrHigher()) {
+            Log.v(TAG, "calling onPreviewReadyToStart to set one shot callback");
+            mAppController.onPreviewReadyToStart();
+        } else {
+            Log.v(TAG, "on L, no one shot callback necessary");
+        }
         try {
             mCameraDevice.setPreviewTexture(surfaceTexture);
             mCameraDevice.startPreview();