Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am ce491ee1: am 76233f06: Merge "Camera2: Legacy: Do not remap EACCES error code to PERMISSION_DENIED" into mnc-dev

Browse Source 
* commit 'ce491ee170e889aeb0b3c0342b86a9c586afd62c':
  Camera2: Legacy: Do not remap EACCES error code to PERMISSION_DENIED
This commit is contained in:
Eino-Ville Talvala
2015-06-06 01:01:16 +00:00
committed by Android Git Automerger
parent 3a1de61c13 ce491ee170
commit e6ddbc7728
1 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/android/hardware/camera2/legacy/CameraDeviceUserShim.java
View File

@@ -88,15 +88,6 @@ public class CameraDeviceUserShim implements ICameraDeviceUser {
mSurfaceIdCounter = 0; 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. * 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 // Save the looper so that we can terminate this thread
// after we are done with it. // after we are done with it.
mLooper = Looper.myLooper(); mLooper = Looper.myLooper();
mInitErrors = translateErrorsFromCamera1(mCamera.cameraInitUnspecified(mCameraId)); mInitErrors = mCamera.cameraInitUnspecified(mCameraId);
mStartDone.open(); mStartDone.open();
Looper.loop(); // Blocks forever until #close is called. Looper.loop(); // Blocks forever until #close is called.
} }