Merge "GenericSource: fix error handling during preparing or rebuffering"

media/libmediaplayerservice/nuplayer/GenericSource.cpp

@@ -1547,6 +1547,16 @@ void NuPlayer::GenericSource::onPollBuffering() {
             notifyBufferingUpdate(100);
         }
 
+        if (mPreparing) {
+            notifyPreparedAndCleanup(finalStatus);
+            mPreparing = false;
+        } else if (mSentPauseOnBuffering) {
+            sendCacheStats();
+            mSentPauseOnBuffering = false;
+            sp<AMessage> notify = dupNotify();
+            notify->setInt32("what", kWhatResumeOnBufferingEnd);
+            notify->post();
+        }
         return;
     }