diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-11-23 11:14:57 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-11-23 11:14:57 -0800 |
| commit | 9df7f31359866a77a47c9fab3171c71715fd0056 (patch) | |
| tree | ff4398c4da25c843a7894944c217a1f1dd5634a9 /libs | |
| parent | 3e18dfab3417e139c7ec3896cea9e303fdc8fa63 (diff) | |
| parent | f0f6c54b13831b11bd7a3bd7a01dc49b7505e56e (diff) | |
| download | frameworks_base-9df7f31359866a77a47c9fab3171c71715fd0056.zip frameworks_base-9df7f31359866a77a47c9fab3171c71715fd0056.tar.gz frameworks_base-9df7f31359866a77a47c9fab3171c71715fd0056.tar.bz2 | |
am f0f6c54b: Merge "frameworks/base: Destroy the overlay even if there is an error"
* commit 'f0f6c54b13831b11bd7a3bd7a01dc49b7505e56e':
frameworks/base: Destroy the overlay even if there is an error
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/ui/Overlay.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/libs/ui/Overlay.cpp b/libs/ui/Overlay.cpp index 3aa8950..b082c53 100644 --- a/libs/ui/Overlay.cpp +++ b/libs/ui/Overlay.cpp @@ -96,7 +96,6 @@ void* Overlay::getBufferAddress(overlay_buffer_t buffer) } void Overlay::destroy() { - if (mStatus != NO_ERROR) return; // Must delete the objects in reverse creation order, thus the // data side must be closed first and then the destroy send to @@ -104,9 +103,15 @@ void Overlay::destroy() { if (mOverlayData) { overlay_data_close(mOverlayData); mOverlayData = NULL; + } else { + LOGD("Overlay::destroy mOverlayData is NULL"); } - mOverlayRef->mOverlayChannel->destroy(); + if (mOverlayRef != 0) { + mOverlayRef->mOverlayChannel->destroy(); + } else { + LOGD("Overlay::destroy mOverlayRef is NULL"); + } } status_t Overlay::getStatus() const { |