diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2019-09-21 08:47:29 -0700 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2019-09-21 08:47:29 -0700 |
| commit | adf5d41ce1b6a0d69b7b0a1ef2b22e9d2a35deb3 (patch) | |
| tree | db9bb1247cdec1dd147b34666a87156f1cae48b8 | |
| parent | 248a776b5bf13d1768d1c1f51f74d9b5db1e0db0 (diff) | |
| parent | 240a5a28559c5fd2e5fc54ec5bd77d73bcf9e9ea (diff) | |
| download | android_packages_apps_Snap-adf5d41ce1b6a0d69b7b0a1ef2b22e9d2a35deb3.tar.gz android_packages_apps_Snap-adf5d41ce1b6a0d69b7b0a1ef2b22e9d2a35deb3.tar.bz2 android_packages_apps_Snap-adf5d41ce1b6a0d69b7b0a1ef2b22e9d2a35deb3.zip | |
Merge 240a5a28559c5fd2e5fc54ec5bd77d73bcf9e9ea on remote branch
Change-Id: I4a9b850e1bf061438d7812f5eccc5d78473ce13b
| -rwxr-xr-x | src/com/android/camera/CaptureModule.java | 4 | ||||
| -rwxr-xr-x | src/com/android/camera/SettingsManager.java | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index 1d5c4680d..8aa654b21 100755 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -4465,7 +4465,9 @@ public class CaptureModule implements CameraModule, PhotoController, setUpVideoCaptureRequestBuilder(mVideoRequestBuilder, cameraId); int deviceSocId = mSettingsManager.getDeviceSocId(); if (deviceSocId == SettingsManager.TALOS_SOCID || - deviceSocId == SettingsManager.MOOREA_SOCID) { + deviceSocId == SettingsManager.MOOREA_SOCID || + deviceSocId == SettingsManager.SAIPAN_SOCID || + deviceSocId == SettingsManager.SM6250_SOCID) { List list = CameraUtil .createHighSpeedRequestList(mVideoRequestBuilder.build()); mCurrentSession.setRepeatingBurst(list,mCaptureCallback, mCameraHandler); diff --git a/src/com/android/camera/SettingsManager.java b/src/com/android/camera/SettingsManager.java index 97d856947..253108603 100755 --- a/src/com/android/camera/SettingsManager.java +++ b/src/com/android/camera/SettingsManager.java @@ -102,6 +102,8 @@ public class SettingsManager implements ListMenu.SettingsListener { public static final int TALOS_SOCID = 355; public static final int MOOREA_SOCID = 365; + public static final int SAIPAN_SOCID = 400; + public static final int SM6250_SOCID = 407; // Custom-Scenemodes start from 100 public static final int SCENE_MODE_CUSTOM_START = 100; |