Merge "CameraDeviceImpl: Follow through reporting device errors even if the... (326f9b5c) · Commits · e / os / android_frameworks_base

core/java/android/hardware/camera2/impl/CameraDeviceImpl.java

+5 −2

Original line number	Diff line number	Diff line
		@@ -85,6 +85,7 @@ public class CameraDeviceImpl extends CameraDevice

		// TODO: guard every function with if (!mRemoteDevice) check (if it was closed)
		private ICameraDeviceUserWrapper mRemoteDevice;
		private boolean mRemoteDeviceInit = false;

		// Lock to synchronize cross-thread access to device public interface
		final Object mInterfaceLock = new Object(); // access from this class and Session only!
		@@ -336,6 +337,8 @@ public class CameraDeviceImpl extends CameraDevice

		mDeviceExecutor.execute(mCallOnOpened);
		mDeviceExecutor.execute(mCallOnUnconfigured);

		mRemoteDeviceInit = true;
		}
		}

		@@ -1752,8 +1755,8 @@ public class CameraDeviceImpl extends CameraDevice
		}

		synchronized(mInterfaceLock) {
		if (mRemoteDevice == null) {
		return; // Camera already closed
		if (mRemoteDevice == null && mRemoteDeviceInit) {
		return; // Camera already closed, user is not interested in errors anymore.
		}

		// Redirect device callback to the offline session in case we are in the middle