am a8328dd2: Delete Singleton on Library Unload

* commit 'a8328dd2f945e8357b3a58c76b0a71a4a2463aa1':
  Delete Singleton on Library Unload

libwvdrmengine/mediacrypto/include/WVCryptoPlugin.h

@@ -7,6 +7,7 @@
 
 #include <stdint.h>
 
+#include "utils/StrongPointer.h"
 #include "utils/Vector.h"
 
 #include "media/hardware/CryptoAPI.h"
@@ -19,7 +20,7 @@ namespace wvdrm {
 class WVCryptoPlugin : public android::CryptoPlugin {
  public:
   WVCryptoPlugin(const void* data, size_t size,
-                 wvcdm::WvContentDecryptionModule* cdm);
+                 const android::sp<wvcdm::WvContentDecryptionModule>& cdm);
   virtual ~WVCryptoPlugin() {}
 
   virtual bool requiresSecureDecoderComponent(const char* mime) const;
@@ -37,7 +38,7 @@ class WVCryptoPlugin : public android::CryptoPlugin {
  private:
   DISALLOW_EVIL_CONSTRUCTORS(WVCryptoPlugin);
 
-  wvcdm::WvContentDecryptionModule* const mCDM;
+  android::sp<wvcdm::WvContentDecryptionModule> const mCDM;
 
   bool mTestMode;
   wvcdm::CdmSessionId mSessionId;

libwvdrmengine/mediacrypto/src/WVCryptoPlugin.cpp

@@ -29,7 +29,7 @@ using namespace std;
 using namespace wvcdm;
 
 WVCryptoPlugin::WVCryptoPlugin(const void* data, size_t size,
-                               WvContentDecryptionModule* cdm)
+                               const sp<WvContentDecryptionModule>& cdm)
   : mCDM(cdm),
     mTestMode(false),
     mSessionId(configureTestMode(data, size)) {}