Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Prevent recomputeDisableFlags from clobbering the system disable flags" into sc-v2-dev

Browse Source
This commit is contained in:
Winson Chung
2021-11-22 17:27:31 +00:00
committed by Android (Google) Code Review
parent dd9f25b195 7567f970d6
commit 27cef855be
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java
View File

@@ -513,10 +513,14 @@ public class CommandQueue extends IStatusBar.Stub implements
* @param animate {@code true} to show animations. * @param animate {@code true} to show animations.
*/ */
public void recomputeDisableFlags(int displayId, boolean animate) { public void recomputeDisableFlags(int displayId, boolean animate) {
// This must update holding the lock otherwise it can clobber the disabled flags set on the
// binder thread from the disable() call
synchronized (mLock) {
int disabled1 = getDisabled1(displayId); int disabled1 = getDisabled1(displayId);
int disabled2 = getDisabled2(displayId); int disabled2 = getDisabled2(displayId);
disable(displayId, disabled1, disabled2, animate); disable(displayId, disabled1, disabled2, animate);
} }
}
private void setDisabled(int displayId, int disabled1, int disabled2) { private void setDisabled(int displayId, int disabled1, int disabled2) {
mDisplayDisabled.put(displayId, new Pair<>(disabled1, disabled2)); mDisplayDisabled.put(displayId, new Pair<>(disabled1, disabled2));