commit ffe72f70e0da02868848c7e71d8f44a5463925ea
author Wale Ogunwale <ogunwale@google.com> Mon Jun 29 15:09:29 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jun 29 15:09:30 2015 +0000
tree 1a02ecf583e217b1d78a8dbf4713d9b94f1cfcb3
parent 78db19c25a3a18d9ccf19b91be17e791e4fd782c
parent e8befb35313e37f519ef61b35669d848eb464437

Merge "Use the correct lock to protect members in PolicyControl"

policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
index d4c530b..1e047b9 100644
--- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
+++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
@@ -1567,6 +1567,8 @@
             if (mImmersiveModeConfirmation != null) {
                 mImmersiveModeConfirmation.loadSetting(mCurrentUserId);
             }
+        }
+        synchronized (mWindowManagerFuncs.getWindowManagerLock()) {
             PolicyControl.reloadFromSetting(mContext);
         }
         if (updateRotation) {