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

* commit '810d5ed23b89265946d7f0fd8b2e6002038f1f2c': Use the correct lock to protect members in PolicyControl
2015-06-29 18:22:03 +00:00
parent 1d75e5273e 810d5ed23b
commit 0dfb1df6ac
1 changed files with 2 additions and 0 deletions
--- a/services/core/java/com/android/server/policy/PhoneWindowManager.java
+++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java
@@ -1689,6 +1689,8 @@ public class PhoneWindowManager implements WindowManagerPolicy {
            if (mImmersiveModeConfirmation != null) {
                mImmersiveModeConfirmation.loadSetting(mCurrentUserId);
            }
+        }
+        synchronized (mWindowManagerFuncs.getWindowManagerLock()) {
            PolicyControl.reloadFromSetting(mContext);
        }
        if (updateRotation) {