Merge "HTTPLiveSource: check for NULL before getTrackCount/Info" into lmp-dev (9c42bf25) · Commits · e / os / android_frameworks_av

media/libstagefright/httplive/LiveSession.cpp

+10 −2

Original line number	Diff line number	Diff line
		@@ -1019,12 +1019,20 @@ bool LiveSession::hasDynamicDuration() const {
		}

		size_t LiveSession::getTrackCount() const {
		if (mPlaylist == NULL) {
		return 0;
		} else {
		return mPlaylist->getTrackCount();
		}
		}

		sp<AMessage> LiveSession::getTrackInfo(size_t trackIndex) const {
		if (mPlaylist == NULL) {
		return NULL;
		} else {
		return mPlaylist->getTrackInfo(trackIndex);
		}
		}

		status_t LiveSession::selectTrack(size_t index, bool select) {
		status_t err = mPlaylist->selectTrack(index, select);