Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Zhijun He
2013-08-28 02:22:36 +00:00
committed by Android (Google) Code Review
parent ae73139f37 e2a11bb74d
commit 5b6ce5a292
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
media/java/android/media/ImageReader.java
View File

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