commit bbe96f0f05a1f1a1b3cfec0d124cb0d63c1ebf2a
author Andreas Huber <andih@google.com> Fri Sep 28 15:13:18 2012 -0700
committer Andreas Huber <andih@google.com> Fri Sep 28 15:13:51 2012 -0700
tree 7459ce3e6248756f05fba750bdc73c4e50ca98be
parent 23f74017a2c457a25382677b6e696c4cfa06cef5

Fix shutdown if HDCP was never instantiated.

Change-Id: Icdf6785880180f417c5432dff54c7e0fb12ef84d
related-to-bug: 7247918

media/libstagefright/wifi-display/source/WifiDisplaySource.cpp

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 @@
     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) {