Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Merge "Camera: add proper null check for mRemoteDevice" into rvc-dev am: ab59e9af27 am: 99a251f707" into rvc-d1-dev-plus-aosp am: 954f80cc77

Browse Source 
Change-Id: I5a22fdabd3d24bf333d7bde233c05ef4577d804b
This commit is contained in:
Automerger Merge Worker
2020-05-01 18:38:31 +00:00
parent b5608f78f7 954f80cc77
commit f94000604e
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/hardware/camera2/impl/CameraDeviceImpl.java
View File

@@ -825,6 +825,7 @@ public class CameraDeviceImpl extends CameraDevice
if (surface == null) throw new IllegalArgumentException("Surface is null");
synchronized(mInterfaceLock) {
checkIfCameraClosedOrInError();
int streamId = -1;
for (int i = 0; i < mConfiguredOutputs.size(); i++) {
final List<Surface> surfaces = mConfiguredOutputs.valueAt(i).getSurfaces();
@@ -847,6 +848,7 @@ public class CameraDeviceImpl extends CameraDevice
maxCount);
synchronized(mInterfaceLock) {
checkIfCameraClosedOrInError();
int streamId = -1;
for (int i = 0; i < mConfiguredOutputs.size(); i++) {
if (surface == mConfiguredOutputs.valueAt(i).getSurface()) {
@@ -865,6 +867,7 @@ public class CameraDeviceImpl extends CameraDevice
public void updateOutputConfiguration(OutputConfiguration config)
throws CameraAccessException {
synchronized(mInterfaceLock) {
checkIfCameraClosedOrInError();
int streamId = -1;
for (int i = 0; i < mConfiguredOutputs.size(); i++) {
if (config.getSurface() == mConfiguredOutputs.valueAt(i).getSurface()) {
@@ -895,6 +898,7 @@ public class CameraDeviceImpl extends CameraDevice
CameraOfflineSession ret;
synchronized(mInterfaceLock) {
checkIfCameraClosedOrInError();
if (mOfflineSessionImpl != null) {
throw new IllegalStateException("Switch to offline mode already in progress");
}
@@ -987,6 +991,7 @@ public class CameraDeviceImpl extends CameraDevice
if (surface == null) throw new IllegalArgumentException("Surface is null");
synchronized(mInterfaceLock) {
checkIfCameraClosedOrInError();
int streamId = -1;
for (int i = 0; i < mConfiguredOutputs.size(); i++) {
if (surface == mConfiguredOutputs.valueAt(i).getSurface()) {
@@ -1009,6 +1014,8 @@ public class CameraDeviceImpl extends CameraDevice
}
synchronized(mInterfaceLock) {
checkIfCameraClosedOrInError();
for (OutputConfiguration config : outputConfigs) {
int streamId = -1;
for (int i = 0; i < mConfiguredOutputs.size(); i++) {