Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 504c5e3f authored by Gloria Wang's avatar Gloria Wang Committed by Android Git Automerger
Browse files

am b8b85ea2: Merge "Fix for bug 4126624. Change the mDrmManagerClientImpl to... 

am b8b85ea2: Merge "Fix for bug 4126624. Change the mDrmManagerClientImpl to sp to avoid double delete the pointer." into honeycomb-mr1

* commit 'b8b85ea296b09cfc5f986e8ee38b959776050d43':
  Fix for bug 4126624. Change the mDrmManagerClientImpl to sp to avoid double delete the pointer.
parents e3f51330 25cd5788

drm/libdrmframework/DrmManagerClient.cpp

+0 −1
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ DrmManagerClient::~DrmManagerClient() { 
    DrmManagerClientImpl::remove(mUniqueId);

    mDrmManagerClientImpl->removeClient(mUniqueId);

    mDrmManagerClientImpl->setOnInfoListener(mUniqueId, NULL);

    delete mDrmManagerClientImpl; mDrmManagerClientImpl = NULL;

}



status_t DrmManagerClient::setOnInfoListener(

include/drm/DrmManagerClient.h

+1 −1
Original line number Diff line number Diff line
@@ -365,7 +365,7 @@ public: 


private:

    int mUniqueId;

    DrmManagerClientImpl* mDrmManagerClientImpl;

    sp<DrmManagerClientImpl> mDrmManagerClientImpl;

};



};