commit 0383876fc5d02f35e05e5c41e0b2335dcdcc2d41
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Sep 30 22:31:10 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 30 22:31:11 2016 +0000
tree a0454a35ada91aaf3c21a67314266625f2c7da30
parent 00c553db3e9c486b016fa030be00f5b53c6b0b8e
parent 1b5a7ee3fdc33ee584a88580171fbad154e10f5d

Merge "Check service binders before dereferencing them"

include/media/stagefright/MediaCodec.h

diff --git a/include/media/stagefright/MediaCodec.h b/include/media/stagefright/MediaCodec.h
index 98780ce..e3e5c2d 100644
--- a/include/media/stagefright/MediaCodec.h
+++ b/include/media/stagefright/MediaCodec.h
@@ -33,7 +33,7 @@
 struct AReplyToken;
 struct AString;
 struct CodecBase;
-struct IBatteryStats;
+class IBatteryStats;
 struct ICrypto;
 class MediaCodecBuffer;
 class IMemory;
@@ -42,7 +42,7 @@
 class IResourceManagerService;
 struct PersistentSurface;
 struct SoftwareRenderer;
-struct Surface;
+class Surface;
 
 struct MediaCodec : public AHandler {
     enum ConfigureFlags {

media/libstagefright/SurfaceMediaSource.cpp

diff --git a/media/libstagefright/SurfaceMediaSource.cpp b/media/libstagefright/SurfaceMediaSource.cpp
index 15ff569..4f1ef30 100644
--- a/media/libstagefright/SurfaceMediaSource.cpp
+++ b/media/libstagefright/SurfaceMediaSource.cpp
@@ -112,7 +112,7 @@
     Mutex::Autolock lock(mMutex);
 
     result.append(buffer);
-    mConsumer->dump(result, "");
+    mConsumer->dumpState(result, "");
 }
 
 status_t SurfaceMediaSource::setFrameRate(int32_t fps)