diff options
| author | zhuw <zhuw@codeaurora.org> | 2018-06-20 18:50:06 +0800 |
|---|---|---|
| committer | Bruno Martins <bgcngm@gmail.com> | 2018-11-20 12:32:18 +0000 |
| commit | de505919d978eeb62ffedb4ea8e0e98fa7888e05 (patch) | |
| tree | e108b40a921b5e4f9cc151b0648daf53fc2c3ded /src/com/android/camera/AndroidCameraManagerImpl.java | |
| parent | d76b4ae20d6c7fc976c9d5d8bc60cdd2b7e0676c (diff) | |
| download | android_packages_apps_Snap-de505919d978eeb62ffedb4ea8e0e98fa7888e05.tar.gz android_packages_apps_Snap-de505919d978eeb62ffedb4ea8e0e98fa7888e05.tar.bz2 android_packages_apps_Snap-de505919d978eeb62ffedb4ea8e0e98fa7888e05.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.java | 7 |
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() |