summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/AndroidCameraManagerImpl.java
diff options
context:
space:
mode:
authorzhuw <zhuw@codeaurora.org>2018-06-20 18:50:06 +0800
committerMichael Bestas <mkbestas@lineageos.org>2019-11-09 22:47:37 +0200
commit751504ff01632d6a97163a42360b980dd1f1d89b (patch)
tree77416037a2720fc4092d23f9570e987a50d1d518 /src/com/android/camera/AndroidCameraManagerImpl.java
parente303fd58aae50e519206aeb20bb7706bc4495885 (diff)
downloadandroid_packages_apps_Snap-751504ff01632d6a97163a42360b980dd1f1d89b.tar.gz
android_packages_apps_Snap-751504ff01632d6a97163a42360b980dd1f1d89b.tar.bz2
android_packages_apps_Snap-751504ff01632d6a97163a42360b980dd1f1d89b.zip
Fix force close when launch camera on P
Don't use hardware.camera.CameraInfo any more Change-Id: I2d0dacc0b597c05df9eacd2fee1e26a33d4de8e7
Diffstat (limited to 'src/com/android/camera/AndroidCameraManagerImpl.java')
-rw-r--r--src/com/android/camera/AndroidCameraManagerImpl.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/com/android/camera/AndroidCameraManagerImpl.java b/src/com/android/camera/AndroidCameraManagerImpl.java
index b7288db63..414ff8101 100644
--- a/src/com/android/camera/AndroidCameraManagerImpl.java
+++ b/src/com/android/camera/AndroidCameraManagerImpl.java
@@ -243,12 +243,13 @@ class AndroidCameraManagerImpl implements CameraManager {
final int cameraId = msg.arg1;
Context context = CameraApp.getContext();
- CameraInfo info = CameraHolder.instance().getCameraInfo()[cameraId];
+ CameraHolder.CameraInfo info =
+ CameraHolder.instance().getCameraInfo()[cameraId];
final boolean isBackCamera =
- info.facing == CameraInfo.CAMERA_FACING_BACK;
+ info.facing == CameraHolder.CameraInfo.CAMERA_FACING_BACK;
final boolean isFrontCamera =
- info.facing == CameraInfo.CAMERA_FACING_FRONT;
+ info.facing == CameraHolder.CameraInfo.CAMERA_FACING_FRONT;
final boolean useOpenLegacyForBackCamera = context.getResources()
.getBoolean(R.bool.back_camera_open_legacy);
final boolean useOpenLegacyForFrontCamera = context.getResources()