diff options
| author | Igor Murashkin <iam@google.com> | 2013-09-16 14:08:23 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-16 14:08:23 -0700 |
| commit | 8f64e3cd42730e0961a9c4d68f3ab49ffabdf649 (patch) | |
| tree | 9d46f8957e6eafe4e6748b04122ae2b126354cde /core/tests | |
| parent | 3cb31ed0948190a3b850a9fc7e0d2a5bd0ffa0c2 (diff) | |
| parent | 142971418c8e9ca539dae40f3c2532956f258e6b (diff) | |
| download | frameworks_base-8f64e3cd42730e0961a9c4d68f3ab49ffabdf649.zip frameworks_base-8f64e3cd42730e0961a9c4d68f3ab49ffabdf649.tar.gz frameworks_base-8f64e3cd42730e0961a9c4d68f3ab49ffabdf649.tar.bz2 | |
am 14297141: am 5cf86aa7: Merge "media: Update ImageReader to remove MaxImagesAcquiredException" into klp-dev
* commit '142971418c8e9ca539dae40f3c2532956f258e6b':
media: Update ImageReader to remove MaxImagesAcquiredException
Diffstat (limited to 'core/tests')
| -rw-r--r-- | core/tests/coretests/src/android/hardware/display/VirtualDisplayTest.java | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/core/tests/coretests/src/android/hardware/display/VirtualDisplayTest.java b/core/tests/coretests/src/android/hardware/display/VirtualDisplayTest.java index 8278579..a2e9ae8 100644 --- a/core/tests/coretests/src/android/hardware/display/VirtualDisplayTest.java +++ b/core/tests/coretests/src/android/hardware/display/VirtualDisplayTest.java @@ -26,7 +26,6 @@ import android.hardware.display.DisplayManager; 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; @@ -427,9 +426,6 @@ public class VirtualDisplayTest extends AndroidTestCase { image.close(); } } - } catch (MaxImagesAcquiredException e) { - // We should never try to consume more buffers than maxImages. - throw new IllegalStateException(e); } finally { mImageReaderLock.unlock(); } |