diff options
author | zhuw <zhuw@codeaurora.org> | 2018-06-20 18:50:06 +0800 |
---|---|---|
committer | Michael Bestas <mkbestas@lineageos.org> | 2019-11-09 22:47:37 +0200 |
commit | 751504ff01632d6a97163a42360b980dd1f1d89b (patch) | |
tree | 77416037a2720fc4092d23f9570e987a50d1d518 /src/com/android/camera/DisableCameraReceiver.java | |
parent | e303fd58aae50e519206aeb20bb7706bc4495885 (diff) | |
download | android_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/DisableCameraReceiver.java')
-rw-r--r-- | src/com/android/camera/DisableCameraReceiver.java | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/src/com/android/camera/DisableCameraReceiver.java b/src/com/android/camera/DisableCameraReceiver.java index 4cef85f46..3551a4306 100644 --- a/src/com/android/camera/DisableCameraReceiver.java +++ b/src/com/android/camera/DisableCameraReceiver.java @@ -53,23 +53,15 @@ public class DisableCameraReceiver extends BroadcastReceiver { } private boolean hasCamera() { - int n = android.hardware.Camera.getNumberOfCameras(); + int n = CameraHolder.instance().getNumberOfCameras(); Log.i(TAG, "number of camera: " + n); return (n > 0); } private boolean hasBackCamera() { - int n = android.hardware.Camera.getNumberOfCameras(); - CameraInfo info = new CameraInfo(); - for (int i = 0; i < n; i++) { - android.hardware.Camera.getCameraInfo(i, info); - if (info.facing == CameraInfo.CAMERA_FACING_BACK) { - Log.i(TAG, "back camera found: " + i); - return true; - } - } - Log.i(TAG, "no back camera"); - return false; + int backCameraId = CameraHolder.instance().getBackCameraId(); + Log.i(TAG, backCameraId == -1 ? "no back camera" : ("back camera found: " + backCameraId)); + return backCameraId != -1; } private void disableComponent(Context context, String klass) { |