diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-07-23 14:16:35 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-07-23 14:16:35 -0700 |
| commit | 52226095665204d8e6d5e3ff6127af25b9512297 (patch) | |
| tree | 1c823ae6a824b289de8d59b9c7035f4bc3f270d7 /src | |
| parent | f7e26cc1ff1d935e2173f9fd4952e0a3d73ff12b (diff) | |
| parent | 7bc5cd2dfd2151eb6b5b57f1f87c44e134b20a92 (diff) | |
| download | android_packages_apps_Snap-52226095665204d8e6d5e3ff6127af25b9512297.tar.gz android_packages_apps_Snap-52226095665204d8e6d5e3ff6127af25b9512297.tar.bz2 android_packages_apps_Snap-52226095665204d8e6d5e3ff6127af25b9512297.zip | |
Merge "SnapdragonCamera: Don't disable the camera"
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/DisableCameraReceiver.java | 2 | ||||
| -rw-r--r-- | src/com/android/camera/VideoModule.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/camera/DisableCameraReceiver.java b/src/com/android/camera/DisableCameraReceiver.java index 351740541..4cef85f46 100644 --- a/src/com/android/camera/DisableCameraReceiver.java +++ b/src/com/android/camera/DisableCameraReceiver.java @@ -29,7 +29,7 @@ import android.util.Log; // this receiver will be disabled, so it will not run again. public class DisableCameraReceiver extends BroadcastReceiver { private static final String TAG = "DisableCameraReceiver"; - private static final boolean CHECK_BACK_CAMERA_ONLY = true; + private static final boolean CHECK_BACK_CAMERA_ONLY = false; private static final String ACTIVITIES[] = { "com.android.camera.CameraLauncher", }; diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index a920d959f..867561509 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -824,7 +824,7 @@ public class VideoModule implements CameraModule, // TODO: This should be checked instead directly +1000. if (mCaptureTimeLapse) quality += 1000; mUnsupportedProfile = false; - boolean hasProfile = CamcorderProfile.hasProfile(quality); + boolean hasProfile = CamcorderProfile.hasProfile(mCameraId, quality); if (!hasProfile) { mUnsupportedProfile = true; return; |