ImageReader: update to remove MaxImagesAcquiredException
Bug: 10691447
Change-Id: Iab8a0a77a19bb0b239fc03563f09d39735546e6e
diff --git a/tests/tests/display/src/android/display/cts/VirtualDisplayTest.java b/tests/tests/display/src/android/display/cts/VirtualDisplayTest.java
index 2242fa5..be4f088 100644
--- a/tests/tests/display/src/android/display/cts/VirtualDisplayTest.java
+++ b/tests/tests/display/src/android/display/cts/VirtualDisplayTest.java
@@ -26,7 +26,6 @@
import android.hardware.display.VirtualDisplay;
import android.media.Image;
import android.media.ImageReader;
-import android.media.ImageReader.MaxImagesAcquiredException;
import android.os.Bundle;
import android.os.Handler;
import android.os.Looper;
@@ -332,9 +331,6 @@
image.close();
}
}
- } catch (MaxImagesAcquiredException e) {
- // Impossible: Images are released immediately after use
- throw new IllegalStateException(e);
} finally {
mImageReaderLock.unlock();
}
diff --git a/tests/tests/hardware/src/android/hardware/camera2/cts/CameraDeviceTest.java b/tests/tests/hardware/src/android/hardware/camera2/cts/CameraDeviceTest.java
index e29569b..f94c80c 100644
--- a/tests/tests/hardware/src/android/hardware/camera2/cts/CameraDeviceTest.java
+++ b/tests/tests/hardware/src/android/hardware/camera2/cts/CameraDeviceTest.java
@@ -26,7 +26,6 @@
import android.hardware.camera2.CaptureResult;
import android.media.Image;
import android.media.ImageReader;
-import android.media.ImageReader.MaxImagesAcquiredException;
import android.os.Handler;
import android.os.SystemClock;
import android.test.AndroidTestCase;
@@ -436,12 +435,13 @@
private class ImageDropperListener implements ImageReader.OnImageAvailableListener {
@Override
public void onImageAvailable(ImageReader reader) {
+ Image image = null;
try {
- Image image = reader.acquireNextImage();
- image.close();
- } catch (MaxImagesAcquiredException e) {
- // Impossible: We drop every frame we get.
- throw new IllegalStateException(e);
+ image = reader.acquireNextImage();
+ } finally {
+ if (image != null) {
+ image.close();
+ }
}
}
}