commit 2b355c2063fa89a50c5fd463c00a47633dfee56b
author Eric Laurent <elaurent@google.com> Tue Aug 18 01:39:58 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Aug 18 01:39:58 2015 +0000
tree 081ccc8603f8f10e6394584bdc75d62c0c04dca2
parent 55de93cf9bf0465f5bd6bb0f413b90bea41b4642
parent 6ee9b57b06a40e2490911cd390e8528eda0b21c5

am 6ee9b57b: am dd6a1764: am c08872f9: Merge "NuPlayerRenderer: handle error when resuming an offloaded track" into mnc-dev

* commit '6ee9b57b06a40e2490911cd390e8528eda0b21c5':
  NuPlayerRenderer: handle error when resuming an offloaded track

media/libmedia/AudioTrack.cpp

diff --git a/media/libmedia/AudioTrack.cpp b/media/libmedia/AudioTrack.cpp
index 7befe5d..444f4d8 100644
--- a/media/libmedia/AudioTrack.cpp
+++ b/media/libmedia/AudioTrack.cpp
@@ -325,7 +325,7 @@
     mTransfer = transferType;
     mDoNotReconnect = doNotReconnect;
 
-    ALOGV_IF(sharedBuffer != 0, "sharedBuffer: %p, size: %d", sharedBuffer->pointer(),
+    ALOGV_IF(sharedBuffer != 0, "sharedBuffer: %p, size: %zu", sharedBuffer->pointer(),
             sharedBuffer->size());
 
     ALOGV("set() streamType %d frameCount %zu flags %04x", streamType, frameCount, flags);

media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp

diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
index 116e8be..1c41c10 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
@@ -1480,7 +1480,10 @@
 
     if (mHasAudio) {
         cancelAudioOffloadPauseTimeout();
-        mAudioSink->start();
+        status_t err = mAudioSink->start();
+        if (err != OK) {
+            notifyAudioTearDown();
+        }
     }
 
     {