summaryrefslogtreecommitdiffstats
path: root/core/java/android/hardware
diff options
context:
space:
mode:
authorEino-Ville Talvala <etalvala@google.com>2013-08-21 10:37:04 -0700
committerEino-Ville Talvala <etalvala@google.com>2013-08-21 10:37:04 -0700
commit5afd3e91b8e785b1b3a42e40b0a3ca11eba2d7cc (patch)
tree4475456c04cac969f14d48ca24f5a2c7423e4671 /core/java/android/hardware
parentb06b8b02674bb6d93f10a5c512aad8694867aa5c (diff)
downloadframeworks_base-5afd3e91b8e785b1b3a42e40b0a3ca11eba2d7cc.zip
frameworks_base-5afd3e91b8e785b1b3a42e40b0a3ca11eba2d7cc.tar.gz
frameworks_base-5afd3e91b8e785b1b3a42e40b0a3ca11eba2d7cc.tar.bz2
Camera2: Convert camera device errors to exceptions
Bug: 10360518 Change-Id: I1752cecf55269c2c9f22962660c0b3fc236138fa
Diffstat (limited to 'core/java/android/hardware')
-rw-r--r--core/java/android/hardware/camera2/impl/CameraDevice.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/hardware/camera2/impl/CameraDevice.java b/core/java/android/hardware/camera2/impl/CameraDevice.java
index fa79051..1fb690e 100644
--- a/core/java/android/hardware/camera2/impl/CameraDevice.java
+++ b/core/java/android/hardware/camera2/impl/CameraDevice.java
@@ -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