commit 16d520fce6a3cecdc6b50e184a00b9585b86e512
author Yusuke Sato <yusukes@google.com> Mon Jun 29 17:49:28 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jun 29 17:49:33 2015 +0000
tree dd8c0fb841448546c4565aada8c1ef2a344f68a7
parent ffe72f70e0da02868848c7e71d8f44a5463925ea
parent f162faaa1266ad38c293e1e54911e389f39c2654

Merge "Rename ZipEntryName to ZipString"

libs/hwui/ShadowTessellator.cpp

diff --git a/libs/hwui/ShadowTessellator.cpp b/libs/hwui/ShadowTessellator.cpp
index 93d4b31..c1b0f7f 100644
--- a/libs/hwui/ShadowTessellator.cpp
+++ b/libs/hwui/ShadowTessellator.cpp
@@ -20,6 +20,7 @@
 #include <math.h>
 #include <utils/Log.h>
 #include <utils/Trace.h>
+#include <utils/MathUtils.h>
 
 #include "AmbientShadow.h"
 #include "Caches.h"
@@ -264,6 +265,8 @@
     // acos( )     --- [0, M_PI]
     // floor(...)  --- [0, EXTRA_VERTEX_PER_PI]
     float dotProduct = vector1.dot(vector2);
+    // make sure that dotProduct value is in acsof input range [-1, 1]
+    dotProduct = MathUtils::clamp(dotProduct, -1.0f, 1.0f);
     // TODO: Use look up table for the dotProduct to extraVerticesNumber
     // computation, if needed.
     float angle = acosf(dotProduct);

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) {