commit 89aeba6ab926a0d249bc6b93450892247697eed3
author Wei Jia <wjia@google.com> Fri Mar 25 21:45:26 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Mar 25 21:45:26 2016 +0000
tree 83864e6187bda775359c3c1799cf3f2f4d17677b
parent e72ae5854c80dc537607da6c5592c8179f3cb928
parent b1d4bac8705f2254f39eea613472f0a9b948871f

Merge "SampleTable: reduce unnecessary logging message." into klp-dev am: f305afb am: e678675 am: 9574bfe am: 1f74760 am: 820d28e
am: b1d4bac

* commit 'b1d4bac8705f2254f39eea613472f0a9b948871f':
  SampleTable: reduce unnecessary logging message.

media/libstagefright/SampleTable.cpp

diff --git a/media/libstagefright/SampleTable.cpp b/media/libstagefright/SampleTable.cpp
index c3afbd1..01ab327 100644
--- a/media/libstagefright/SampleTable.cpp
+++ b/media/libstagefright/SampleTable.cpp
@@ -517,8 +517,9 @@
     Mutex::Autolock autoLock(mLock);
 
     if (mSampleTimeEntries != NULL || mNumSampleSizes == 0) {
-        ALOGE("b/23247055, mNumSampleSizes(%u), mSampleTimeEntries(%p)",
-                mNumSampleSizes, mSampleTimeEntries);
+        if (mNumSampleSizes == 0) {
+            ALOGE("b/23247055, mNumSampleSizes(%u)", mNumSampleSizes);
+        }
         return;
     }