commit 8969aae0699976357868ed263d56ae3815c8fa9d
author Xin Li <delphij@google.com> Wed Aug 08 02:50:21 2018 -0700
committer android-build-merger <android-build-merger@google.com> Wed Aug 08 02:50:21 2018 -0700
tree 548b43df9e2e65530d1373296e12be4958e4e588
parent 8fd94aa6dd21f15b1bd2e603b216dd8fa18f3650
parent d5766a45c245826951cefc5915661a0be7946c97

Merge "Merge Android Pie into master" am: edfebcf880 am: 81ea371384 am: 8a46169687
am: d5766a45c2

Change-Id: Ie447dd7f67d1614404bcbc3891759dc371a18f38

src/android/AudioPlayer_to_android.cpp

diff --git a/src/android/AudioPlayer_to_android.cpp b/src/android/AudioPlayer_to_android.cpp
index e361dcb..b81f4c2 100644
--- a/src/android/AudioPlayer_to_android.cpp
+++ b/src/android/AudioPlayer_to_android.cpp
@@ -1695,6 +1695,9 @@
                 pAudioPlayer->mSessionId);
         android::status_t status = pat->initCheck();
         if (status != android::NO_ERROR) {
+            // AudioTracks are meant to be refcounted, so their dtor is protected.
+            static_cast<void>(android::sp<android::AudioTrack>(pat));
+
             SL_LOGE("AudioTrack::initCheck status %u", status);
             // FIXME should return a more specific result depending on status
             result = SL_RESULT_CONTENT_UNSUPPORTED;

src/android/android_AudioSfDecoder.h

diff --git a/src/android/android_AudioSfDecoder.h b/src/android/android_AudioSfDecoder.h
index d62f0ed..0043539 100644
--- a/src/android/android_AudioSfDecoder.h
+++ b/src/android/android_AudioSfDecoder.h
@@ -19,7 +19,6 @@
 
 #include <media/DataSource.h>
 #include <media/MediaSource.h>
-#include <media/MediaExtractor.h>
 #include <media/stagefright/FileSource.h>
 #include <media/stagefright/MediaDefs.h>
 #include <media/stagefright/MetaData.h>