diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-09-07 19:34:08 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-09-07 19:34:08 -0700 |
| commit | fcab608fbee1ec72bacde7d1940233b4c82ebd34 (patch) | |
| tree | 7940baba2429d602df22b08977eae5169c6f7a8d /src/com/android/camera/VideoModule.java | |
| parent | 8a64bd9b0ca29a4eadebc81fa97d20b12738010b (diff) | |
| parent | 65e092eaddc521328152ece8643c674a925fdf76 (diff) | |
| download | android_packages_apps_Snap-fcab608fbee1ec72bacde7d1940233b4c82ebd34.tar.gz android_packages_apps_Snap-fcab608fbee1ec72bacde7d1940233b4c82ebd34.tar.bz2 android_packages_apps_Snap-fcab608fbee1ec72bacde7d1940233b4c82ebd34.zip | |
Merge "SnapdragonCamera: Use resume/start based on the SDK version for cam2" into camera.lnx.1.0-dev.1.0
Diffstat (limited to 'src/com/android/camera/VideoModule.java')
| -rw-r--r-- | src/com/android/camera/VideoModule.java | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index bae16bde6..75a610e30 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -106,9 +106,6 @@ public class VideoModule implements CameraModule, private static final long SHUTTER_BUTTON_TIMEOUT = 0L; // 0ms - public static final boolean HAS_RESUME_SUPPORTED = - Build.VERSION.SDK_INT > Build.VERSION_CODES.M; - /** * An unpublished intent flag requesting to start recording straight away * and return as soon as recording is stopped. @@ -1979,7 +1976,7 @@ public class VideoModule implements CameraModule, mMediaRecorderPausing = false; mRecordingStartTime = SystemClock.uptimeMillis(); updateRecordingTime(); - if (!HAS_RESUME_SUPPORTED){ + if (!ApiHelper.HAS_RESUME_SUPPORTED){ mMediaRecorder.start(); } else { try { |