From e2a11bb74df06bb48a0d71b8cf78cc469b53931b Mon Sep 17 00:00:00 2001
From: Zhijun He <zhijunhe@google.com>
Date: Tue, 27 Aug 2013 16:02:21 -0700
Subject: [PATCH] ImageReader: Fix null listener case

Only do the handler check when listener is not null.

Bug: 10360518
Change-Id: I9940942ae95a492c92e028e5f862beea16e1da80
---
 media/java/android/media/ImageReader.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media/java/android/media/ImageReader.java b/media/java/android/media/ImageReader.java
index f3356c9fba479..b14a899f33fa8 100644
--- 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() {