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

Merge "Make CameraDeviceImpl#close() idempotent (for real)." into mnc-dev

Browse Source
This commit is contained in:
Ruben Brunk
2015-06-12 00:25:46 +00:00
committed by Android (Google) Code Review
parent c37c7d9dbe 0953b6461a
commit 25f3a7d19b
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,6 +52,7 @@ import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.Iterator; import java.util.Iterator;
@@ -79,7 +80,7 @@ public class CameraDeviceImpl extends CameraDevice {
private volatile StateCallbackKK mSessionStateCallback; private volatile StateCallbackKK mSessionStateCallback;
private final Handler mDeviceHandler; private final Handler mDeviceHandler;
private volatile boolean mClosing = false; private final AtomicBoolean mClosing = new AtomicBoolean();
private boolean mInError = false; private boolean mInError = false;
private boolean mIdle = true; private boolean mIdle = true;
@@ -906,6 +907,10 @@ public class CameraDeviceImpl extends CameraDevice {
@Override @Override
public void close() { public void close() {
synchronized (mInterfaceLock) { synchronized (mInterfaceLock) {
if (mClosing.getAndSet(true)) {
return;
}
try { try {
if (mRemoteDevice != null) { if (mRemoteDevice != null) {
mRemoteDevice.disconnect(); mRemoteDevice.disconnect();
@@ -1917,7 +1922,7 @@ public class CameraDeviceImpl extends CameraDevice {
/** Whether the camera device has started to close (may not yet have finished) */ /** Whether the camera device has started to close (may not yet have finished) */
private boolean isClosed() { private boolean isClosed() {
return mClosing; return mClosing.get();
} }
private CameraCharacteristics getCharacteristics() { private CameraCharacteristics getCharacteristics() {