GenericSource: fix error handling during preparing or rebuffering
Test: cts
Bug: 119271544
Bug: 115287688
Change-Id: I18db8600c1b7d3cfa472ff376cf0f8629f0fbaff
diff --git a/media/libmediaplayerservice/nuplayer/GenericSource.cpp b/media/libmediaplayerservice/nuplayer/GenericSource.cpp
index 8cd6eda..f3b69d6 100644
--- a/media/libmediaplayerservice/nuplayer/GenericSource.cpp
+++ b/media/libmediaplayerservice/nuplayer/GenericSource.cpp
@@ -1547,6 +1547,16 @@
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;
}