Merge "Camera2: Do not throw unexpected runtime exception to app" into mnc-dev

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",
+            throw new CameraRuntimeException(CAMERA_ERROR,
-                    errorFlag));
+                    String.format("Unknown camera device error %d", errorFlag));
         }
     }