summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice
diff options
context:
space:
mode:
authorRobert Shih <robertshih@google.com>2015-08-14 18:05:23 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-08-14 18:05:23 +0000
commitf33a302f112f19503e842cacfea1492ae81796b0 (patch)
tree10a9c13444652c1bad0c1e5436790fc438e47f00 /media/libmediaplayerservice
parent1a4ceb8309ffb6c8ce888891b6e861ae7ca399b8 (diff)
parent6d3cd2e22c73e5b554a2c4e34d51616f8737e571 (diff)
downloadframeworks_av-f33a302f112f19503e842cacfea1492ae81796b0.zip
frameworks_av-f33a302f112f19503e842cacfea1492ae81796b0.tar.gz
frameworks_av-f33a302f112f19503e842cacfea1492ae81796b0.tar.bz2
Merge "RTSPSource::pause mHandler NULL check" into mnc-dr-dev
Diffstat (limited to 'media/libmediaplayerservice')
-rw-r--r--media/libmediaplayerservice/nuplayer/RTSPSource.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/nuplayer/RTSPSource.cpp b/media/libmediaplayerservice/nuplayer/RTSPSource.cpp
index 58ff113..af0351e 100644
--- a/media/libmediaplayerservice/nuplayer/RTSPSource.cpp
+++ b/media/libmediaplayerservice/nuplayer/RTSPSource.cpp
@@ -134,7 +134,9 @@ void NuPlayer::RTSPSource::pause() {
return;
}
}
- mHandler->pause();
+ if (mHandler != NULL) {
+ mHandler->pause();
+ }
}
void NuPlayer::RTSPSource::resume() {