From d3e39d16cb4b177e2fa99e7d4e0bb0e6721fe7fc Mon Sep 17 00:00:00 2001 From: Eino-Ville Talvala Date: Wed, 17 Jun 2015 11:18:43 -0700 Subject: [PATCH] Camera2: Do not throw unexpected runtime exception to app Use a generic CameraAccessException DEVICE_ERROR exception instead Bug: 21869917 Change-Id: I73581b817cbdcbb4b876c234f050f725a459a29b --- .../android/hardware/camera2/utils/CameraBinderDecorator.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/java/android/hardware/camera2/utils/CameraBinderDecorator.java b/core/java/android/hardware/camera2/utils/CameraBinderDecorator.java index d461bca532e17..1aee79477e3f0 100644 --- a/core/java/android/hardware/camera2/utils/CameraBinderDecorator.java +++ b/core/java/android/hardware/camera2/utils/CameraBinderDecorator.java @@ -138,8 +138,8 @@ public class CameraBinderDecorator { * errors, then add them to the top switch statement */ if (errorFlag < 0) { - throw new UnsupportedOperationException(String.format("Unknown error %d", - errorFlag)); + throw new CameraRuntimeException(CAMERA_ERROR, + String.format("Unknown camera device error %d", errorFlag)); } }