am 0125ba70: Merge "Camera2: Convert camera device errors to exceptions" into klp-dev

* commit '0125ba70bb41406ed597002498823232c8b163b8':
  Camera2: Convert camera device errors to exceptions
This commit is contained in:
Eino-Ville Talvala
2013-08-21 11:08:53 -07:00
committed by Android Git Automerger

View File

@@ -24,6 +24,7 @@ import android.hardware.camera2.CameraAccessException;
import android.hardware.camera2.CameraProperties;
import android.hardware.camera2.CaptureRequest;
import android.hardware.camera2.utils.CameraRuntimeException;
import android.hardware.camera2.utils.CameraBinderDecorator;
import android.os.IBinder;
import android.os.RemoteException;
import android.util.Log;
@@ -67,7 +68,8 @@ public class CameraDevice implements android.hardware.camera2.CameraDevice {
}
public void setRemoteDevice(ICameraDeviceUser remoteDevice) {
mRemoteDevice = remoteDevice;
// TODO: Move from decorator to direct binder-mediated exceptions
mRemoteDevice = CameraBinderDecorator.newInstance(remoteDevice);
}
@Override