summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2014-06-16 23:31:03 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-06-16 21:50:51 +0000
commit1c46ae419c8f04c0359fea82ef8c8718db14e9b4 (patch)
tree9c32a33a8c9ef21a6ef267e01872977a98e3f3c4 /media
parent2c749d242759ea36c0229ea933f22b6363337b19 (diff)
parent48163e060d88ac1cbc915911c1c055907a4b7c71 (diff)
downloadframeworks_base-1c46ae419c8f04c0359fea82ef8c8718db14e9b4.zip
frameworks_base-1c46ae419c8f04c0359fea82ef8c8718db14e9b4.tar.gz
frameworks_base-1c46ae419c8f04c0359fea82ef8c8718db14e9b4.tar.bz2
Merge "Don't send unneeded messages."
Diffstat (limited to 'media')
-rw-r--r--media/java/android/media/MediaCodec.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/java/android/media/MediaCodec.java b/media/java/android/media/MediaCodec.java
index f258063..22db344 100644
--- a/media/java/android/media/MediaCodec.java
+++ b/media/java/android/media/MediaCodec.java
@@ -782,7 +782,7 @@ final public class MediaCodec {
private void postEventFromNative(
int what, int arg1, int arg2, Object obj) {
- if (mEventHandler != null) {
+ if (mEventHandler != null && mNotificationCallback != null) {
Message msg = mEventHandler.obtainMessage(what, arg1, arg2, obj);
mEventHandler.sendMessage(msg);
}