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

Commit b8b85ea2 authored by Gloria Wang's avatar Gloria Wang Committed by Android (Google) Code Review
Browse files

Merge "Fix for bug 4126624. Change the mDrmManagerClientImpl to sp to avoid... 

Merge "Fix for bug 4126624. Change the mDrmManagerClientImpl to sp to avoid double delete the pointer." into honeycomb-mr1
parents cc4b6a61 4c87a750

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;

};



};