From b114e9c159156a15c4998e37bc2af38920886cfa Mon Sep 17 00:00:00 2001
From: sakal <sakal@webrtc.org>
Date: Mon, 6 Feb 2017 04:55:21 -0800
Subject: [PATCH] Camera2Session: Add return statements after reportError where
 needed.

BUG=webrtc:7117

Review-Url: https://codereview.webrtc.org/2674243002
Cr-Commit-Position: refs/heads/master@{#16445}
---
 webrtc/sdk/android/api/org/webrtc/Camera2Session.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/webrtc/sdk/android/api/org/webrtc/Camera2Session.java b/webrtc/sdk/android/api/org/webrtc/Camera2Session.java
index 0ef3e42d15..dfc6aa374a 100644
--- a/webrtc/sdk/android/api/org/webrtc/Camera2Session.java
+++ b/webrtc/sdk/android/api/org/webrtc/Camera2Session.java
@@ -315,6 +315,7 @@ public class Camera2Session implements CameraSession {
       cameraCharacteristics = cameraManager.getCameraCharacteristics(cameraId);
     } catch (final CameraAccessException e) {
       reportError("getCameraCharacteristics(): " + e.getMessage());
+      return;
     }
     cameraOrientation = cameraCharacteristics.get(CameraCharacteristics.SENSOR_ORIENTATION);
     isCameraFrontFacing = cameraCharacteristics.get(CameraCharacteristics.LENS_FACING)
@@ -338,6 +339,7 @@ public class Camera2Session implements CameraSession {
 
     if (framerateRanges.isEmpty() || sizes.isEmpty()) {
       reportError("No supported capture formats.");
+      return;
     }
 
     final CaptureFormat.FramerateRange bestFpsRange =
@@ -360,6 +362,7 @@ public class Camera2Session implements CameraSession {
       cameraManager.openCamera(cameraId, new CameraStateCallback(), cameraThreadHandler);
     } catch (CameraAccessException e) {
       reportError("Failed to open camera: " + e);
+      return;
     }
   }