Merge "Use the correct lock to protect members in PolicyControl" into mnc-dev

2015-06-29 18:12:54 +00:00
parent 82b3f67711 cc6366dde1
commit 810d5ed23b
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) {