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

am 810d5ed2: Merge "Use the correct lock to protect members in PolicyControl" into mnc-dev

Browse Source 
* commit '810d5ed23b89265946d7f0fd8b2e6002038f1f2c':
  Use the correct lock to protect members in PolicyControl
This commit is contained in:
Wale Ogunwale
2015-06-29 18:22:03 +00:00
committed by Android Git Automerger
parent 1d75e5273e 810d5ed23b
commit 0dfb1df6ac
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/policy/PhoneWindowManager.java
View File

@@ -1689,6 +1689,8 @@ public class PhoneWindowManager implements WindowManagerPolicy {
if (mImmersiveModeConfirmation != null) { if (mImmersiveModeConfirmation != null) {
mImmersiveModeConfirmation.loadSetting(mCurrentUserId); mImmersiveModeConfirmation.loadSetting(mCurrentUserId);
} }
}
synchronized (mWindowManagerFuncs.getWindowManagerLock()) {
PolicyControl.reloadFromSetting(mContext); PolicyControl.reloadFromSetting(mContext);
} }
if (updateRotation) { if (updateRotation) {