From db70a9785315a29c1d0d1233d883062b8d07c46f Mon Sep 17 00:00:00 2001 From: Eino-Ville Talvala Date: Wed, 3 Jun 2015 16:27:11 -0700 Subject: Camera2: Legacy: Do not remap EACCES error code to PERMISSION_DENIED This remap causes non-Legacy and Legacy devices to have different error behavior when the camera permission is removed from a pre-M application. Without the remap, both routes map to CameraAccessException with code CAMERA_DISABLED. Bug: 21604925 Change-Id: I4ab18dca961cc7cedaccba0531253c9c4ef1d60e --- .../android/hardware/camera2/legacy/CameraDeviceUserShim.java | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/core/java/android/hardware/camera2/legacy/CameraDeviceUserShim.java b/core/java/android/hardware/camera2/legacy/CameraDeviceUserShim.java index bc0a3a8d3007..6020d374c44f 100644 --- a/core/java/android/hardware/camera2/legacy/CameraDeviceUserShim.java +++ b/core/java/android/hardware/camera2/legacy/CameraDeviceUserShim.java @@ -88,15 +88,6 @@ public class CameraDeviceUserShim implements ICameraDeviceUser { mSurfaceIdCounter = 0; } - private static int translateErrorsFromCamera1(int errorCode) { - switch (errorCode) { - case CameraBinderDecorator.EACCES: - return CameraBinderDecorator.PERMISSION_DENIED; - default: - return errorCode; - } - } - /** * Create a separate looper/thread for the camera to run on; open the camera. * @@ -140,7 +131,7 @@ public class CameraDeviceUserShim implements ICameraDeviceUser { // Save the looper so that we can terminate this thread // after we are done with it. mLooper = Looper.myLooper(); - mInitErrors = translateErrorsFromCamera1(mCamera.cameraInitUnspecified(mCameraId)); + mInitErrors = mCamera.cameraInitUnspecified(mCameraId); mStartDone.open(); Looper.loop(); // Blocks forever until #close is called. } -- cgit v1.2.3-59-g8ed1b