Merge "ImageReader: Fix null listener case" into klp-dev

2013-08-28 02:22:36 +00:00
parent ae73139f37 e2a11bb74d
commit 5b6ce5a292
1 changed files with 2 additions and 2 deletions
--- a/media/java/android/media/ImageReader.java
+++ b/media/java/android/media/ImageReader.java
@@ -194,7 +194,7 @@ public final class ImageReader implements AutoCloseable {

        Looper looper;
        mHandler = handler;
-        if (mHandler == null) {
+        if (listener != null && mHandler == null) {
            if ((looper = Looper.myLooper()) != null) {
                mHandler = new Handler();
            } else {
@@ -283,7 +283,7 @@ public final class ImageReader implements AutoCloseable {
            return;
        }

-        if (ir.mHandler != null) {
+        if (ir.mHandler != null && ir.mImageListener != null) {
            ir.mHandler.post(new Runnable() {
                @Override
                public void run() {