ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "fix a bug that caused the off animation to not show sometimes"

Browse Source
This commit is contained in:
Mathias Agopian 2011-09-02 15:31:20 -07:00 committed by Android (Google) Code Review
commit 1ee7436d93
3 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
services/surfaceflinger/DisplayHardware/HWComposer.cpp
View File

@ -108,8 +108,21 @@ status_t HWComposer::commit() const {
}
status_t HWComposer::release() const {
int err = mHwc->set(mHwc, NULL, NULL, NULL);
return (status_t)err;
if (mHwc) {
int err = mHwc->set(mHwc, NULL, NULL, NULL);
return (status_t)err;
}
return NO_ERROR;
}
status_t HWComposer::disable() {
if (mHwc) {
free(mList);
mList = NULL;
int err = mHwc->prepare(mHwc, NULL);
return (status_t)err;
}
return NO_ERROR;
}
size_t HWComposer::getNumLayers() const {

3
services/surfaceflinger/DisplayHardware/HWComposer.h
View File

@ -50,6 +50,9 @@ public:
// Asks the HAL what it can do
status_t prepare() const;
// disable hwc until next createWorkList
status_t disable();
// commits the list
status_t commit() const;

6
services/surfaceflinger/SurfaceFlinger.cpp
View File

@ -2113,6 +2113,12 @@ status_t SurfaceFlinger::turnElectronBeamOffImplLocked(int32_t mode)
// we're already off
return NO_ERROR;
}
// turn off hwc while we're doing the animation
hw.getHwComposer().disable();
// and make sure to turn it back on (if needed) next time we compose
invalidateHwcGeometry();
if (mode & ISurfaceComposer::eElectronBeamAnimationOff) {
electronBeamOffAnimationImplLocked();
}