commit 795d95ecd7ad27fdd10f66113033ad98c4f5baf7
author Christopher Tate <ctate@google.com> Mon Jun 29 18:54:56 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jun 29 18:54:58 2015 +0000
tree f33c0759dabf0b76ab2297a5f0f673e6baf96d4f
parent 810d5ed23b89265946d7f0fd8b2e6002038f1f2c
parent ffd5864202a7c85620b7eb5032dc0120481705e5

Merge "Throw DeadObjectException on failed transaction, not RuntimeException" into mnc-dev

services/core/java/com/android/server/policy/PhoneWindowManager.java

diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java
index 93e1f18..d31c6e9 100644
--- a/services/core/java/com/android/server/policy/PhoneWindowManager.java
+++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java
@@ -1689,6 +1689,8 @@
             if (mImmersiveModeConfirmation != null) {
                 mImmersiveModeConfirmation.loadSetting(mCurrentUserId);
             }
+        }
+        synchronized (mWindowManagerFuncs.getWindowManagerLock()) {
             PolicyControl.reloadFromSetting(mContext);
         }
         if (updateRotation) {