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

am e36829ee: Merge "Fix legacy disconnect callback." into mnc-dev

Browse Source 
* commit 'e36829ee00d178846cb95bebde41cc9204edcd76':
  Fix legacy disconnect callback.
This commit is contained in:
Ruben Brunk
2015-06-12 22:31:11 +00:00
committed by Android Git Automerger
parent 10e07310b0 e36829ee00
commit a43b50613d
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/java/android/hardware/camera2/legacy/RequestThreadManager.java
View File

@@ -187,8 +187,18 @@ public class RequestThreadManager {
private final Camera.ErrorCallback mErrorCallback = new Camera.ErrorCallback() {
@Override
public void onError(int i, Camera camera) {
Log.e(TAG, "Received error " + i + " from the Camera1 ErrorCallback");
mDeviceState.setError(CameraDeviceImpl.CameraDeviceCallbacks.ERROR_CAMERA_DEVICE);
switch(i) {
case Camera.CAMERA_ERROR_EVICTED: {
flush();
mDeviceState.setError(
CameraDeviceImpl.CameraDeviceCallbacks.ERROR_CAMERA_DISCONNECTED);
} break;
default: {
Log.e(TAG, "Received error " + i + " from the Camera1 ErrorCallback");
mDeviceState.setError(
CameraDeviceImpl.CameraDeviceCallbacks.ERROR_CAMERA_DEVICE);
} break;
}
}
};