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

Ignore display state changes for disconnected displays

Browse Source 
When a display is disconnected, removing it from SurfaceFlinger's
display list is non-atomic with removing it from the Display Manager
and any in-flight transactions. So SurfaceFlinger might get a display
state change transaction for a display it has already forgotten about.
Just ignore these.

Bug: 7288082
Change-Id: Ic27e55377f3db40fb34e3b1cd67e43297df117a2
This commit is contained in:
Jesse Hall 2012-10-04 16:29:19 -07:00
parent 81cd5d3b94
commit 9a14392256
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
services/surfaceflinger/SurfaceFlinger.cpp
View File

@ -1707,8 +1707,12 @@ void SurfaceFlinger::setTransactionState(
uint32_t SurfaceFlinger::setDisplayStateLocked(const DisplayState& s) uint32_t SurfaceFlinger::setDisplayStateLocked(const DisplayState& s)
{ {
ssize_t dpyIdx = mCurrentState.displays.indexOfKey(s.token);
if (dpyIdx < 0)
return 0;
uint32_t flags = 0; uint32_t flags = 0;
DisplayDeviceState& disp(mCurrentState.displays.editValueFor(s.token)); DisplayDeviceState& disp(mCurrentState.displays.editValueAt(dpyIdx));
if (disp.isValid()) { if (disp.isValid()) {
const uint32_t what = s.what; const uint32_t what = s.what;
if (what & DisplayState::eSurfaceChanged) { if (what & DisplayState::eSurfaceChanged) {