diff options
| author | Andreas Huber <andih@google.com> | 2012-09-28 15:13:18 -0700 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2012-09-28 15:13:51 -0700 |
| commit | d1805ebb0ff7694441fd95b5801fbce222849b6f (patch) | |
| tree | a3e520d9cb77fac1a8f6c232ff112353442c3bb1 /media | |
| parent | 0c0cfd7fb8042b63f0ffebd2de563f2ef733526f (diff) | |
| download | frameworks_av-d1805ebb0ff7694441fd95b5801fbce222849b6f.zip frameworks_av-d1805ebb0ff7694441fd95b5801fbce222849b6f.tar.gz frameworks_av-d1805ebb0ff7694441fd95b5801fbce222849b6f.tar.bz2 | |
Fix shutdown if HDCP was never instantiated.
Change-Id: Icdf6785880180f417c5432dff54c7e0fb12ef84d
related-to-bug: 7247918
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/wifi-display/source/WifiDisplaySource.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/media/libstagefright/wifi-display/source/WifiDisplaySource.cpp b/media/libstagefright/wifi-display/source/WifiDisplaySource.cpp index 8091cc4..d5ffc65 100644 --- a/media/libstagefright/wifi-display/source/WifiDisplaySource.cpp +++ b/media/libstagefright/wifi-display/source/WifiDisplaySource.cpp @@ -1140,9 +1140,11 @@ void WifiDisplaySource::finishStop2() { ALOGV("finishStop2"); #if REQUIRE_HDCP - mHDCP->setObserver(NULL); - mHDCPObserver.clear(); - mHDCP.clear(); + if (mHDCP != NULL) { + mHDCP->setObserver(NULL); + mHDCPObserver.clear(); + mHDCP.clear(); + } #endif if (mSessionID != 0) { |