diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2013-08-21 18:00:12 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-08-21 18:05:49 +0000 |
| commit | 0125ba70bb41406ed597002498823232c8b163b8 (patch) | |
| tree | 213eb8194174f2773125abf6135d6b5bd45c4b37 /core/java/android | |
| parent | a2e88ef89611d69b65b1830cc5ffebfb679e9d4d (diff) | |
| parent | 5afd3e91b8e785b1b3a42e40b0a3ca11eba2d7cc (diff) | |
Merge "Camera2: Convert camera device errors to exceptions" into klp-dev
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/hardware/camera2/impl/CameraDevice.java | 4 |
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 fa790510b46b..1fb690e3c59d 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 |