diff options
author | Narayan Kamath <narayan@google.com> | 2015-02-23 15:47:54 +0000 |
---|---|---|
committer | Narayan Kamath <narayan@google.com> | 2015-02-23 15:47:54 +0000 |
commit | 688ff4cf0f93d1a886437884f23874e5595d59a3 (patch) | |
tree | b8ef91775dfc3dff86d05aa5638b17dee597ca91 /cmds/bootanimation | |
parent | adb52ef7034d4d3e0eee58cedae2a343d29771b9 (diff) | |
download | frameworks_base-688ff4cf0f93d1a886437884f23874e5595d59a3.zip frameworks_base-688ff4cf0f93d1a886437884f23874e5595d59a3.tar.gz frameworks_base-688ff4cf0f93d1a886437884f23874e5595d59a3.tar.bz2 |
Track removal of refcounts from FileMap.
Use delete instead of release.
Change-Id: I25c841b368aa9d51e9259399b94cafa2bbb7a076
Diffstat (limited to 'cmds/bootanimation')
-rw-r--r-- | cmds/bootanimation/AudioPlayer.cpp | 2 | ||||
-rw-r--r-- | cmds/bootanimation/BootAnimation.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cmds/bootanimation/AudioPlayer.cpp b/cmds/bootanimation/AudioPlayer.cpp index 81fe5f8..2932130 100644 --- a/cmds/bootanimation/AudioPlayer.cpp +++ b/cmds/bootanimation/AudioPlayer.cpp @@ -305,7 +305,7 @@ bool AudioPlayer::threadLoop() exit: if (pcm) pcm_close(pcm); - mCurrentFile->release(); + delete mCurrentFile; mCurrentFile = NULL; return false; } diff --git a/cmds/bootanimation/BootAnimation.cpp b/cmds/bootanimation/BootAnimation.cpp index 1d4de22..bb25ec6 100644 --- a/cmds/bootanimation/BootAnimation.cpp +++ b/cmds/bootanimation/BootAnimation.cpp @@ -179,7 +179,7 @@ status_t BootAnimation::initTexture(const Animation::Frame& frame) // FileMap memory is never released until application exit. // Release it now as the texture is already loaded and the memory used for // the packed resource can be released. - frame.map->release(); + delete frame.map; // ensure we can call getPixels(). No need to call unlock, since the // bitmap will go out of scope when we return from this method. @@ -446,7 +446,7 @@ bool BootAnimation::readFile(const char* name, String8& outString) } outString.setTo((char const*)entryMap->getDataPtr(), entryMap->getDataLength()); - entryMap->release(); + delete entryMap; return true; } |