Merge "camera2: Fix null check in PictureCallback." into lmp-dev (820a08a5) · Commits · e / os / android_frameworks_base

core/java/android/hardware/camera2/legacy/RequestThreadManager.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -195,12 +195,12 @@ public class RequestThreadManager {
		public void onPictureTaken(byte[] data, Camera camera) {
		Log.i(TAG, "Received jpeg.");
		Pair<RequestHolder, Long> captureInfo = mCaptureCollector.jpegProduced();
		RequestHolder holder = captureInfo.first;
		long timestamp = captureInfo.second;
		if (holder == null) {
		if (captureInfo == null \|\| captureInfo.first == null) {
		Log.e(TAG, "Dropping jpeg frame.");
		return;
		}
		RequestHolder holder = captureInfo.first;
		long timestamp = captureInfo.second;
		for (Surface s : holder.getHolderTargets()) {
		try {
		if (LegacyCameraDevice.containsSurfaceId(s, mJpegSurfaceIds)) {