commit da69f1c26bff1729331456db7e9c933bf82663d0
author The Android Open Source Project <initial-contribution@android.com> Mon Apr 15 10:46:05 2013 -0700
committer The Android Open Source Project <initial-contribution@android.com> Mon Apr 15 10:46:05 2013 -0700
tree f4d92dfd643f05f5cd49e15eb530783eeeb13d5f
parent 2dd69cfca3e2a2b7c398198366d03ba1801e1bd9
parent eadd1cf1608de3ef3c45fd16aa055a023eb2196f

Reconcile with jb-mr2-release - do not merge

Change-Id: I73bc6567706973507090e4c9bc05cd61ee850260

media/libmedia/mediaplayer.cpp

diff --git a/media/libmedia/mediaplayer.cpp b/media/libmedia/mediaplayer.cpp
index 3defec3..ecae3d3 100644
--- a/media/libmedia/mediaplayer.cpp
+++ b/media/libmedia/mediaplayer.cpp
@@ -398,6 +398,13 @@
     if (mPlayer != 0 && isValidState) {
         int durationMs;
         status_t ret = mPlayer->getDuration(&durationMs);
+
+        if (ret != OK) {
+            // Do not enter error state just because no duration was available.
+            durationMs = -1;
+            ret = OK;
+        }
+
         if (msec) {
             *msec = durationMs;
         }

media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp

diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp
index 723af09..bdafb29 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp
@@ -314,11 +314,11 @@
     Mutex::Autolock autoLock(mLock);
 
     if (mDurationUs < 0) {
-        *msec = 0;
-    } else {
-        *msec = (mDurationUs + 500ll) / 1000;
+        return UNKNOWN_ERROR;
     }
 
+    *msec = (mDurationUs + 500ll) / 1000;
+
     return OK;
 }