commit 176e71081b17787652c778cd115e079199dac536
author Mathias Agopian <mathias@google.com> Wed Mar 09 14:32:47 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Wed Mar 09 14:32:47 2011 -0800
tree ae831a81039270b562c3c77675d32141336986d0
parent 67eab1e9cd9a7bfb1a32492cdaa6f52bf470e11d
parent 838aa45b99f504596971063003fa8a75e89e4c41

am 838aa45b: Merge "fix [4026375] SensorManager quaternion functions can call sqrt with a negative number" into honeycomb-mr1

* commit '838aa45b99f504596971063003fa8a75e89e4c41':
  fix [4026375] SensorManager quaternion functions can call sqrt with a negative number

core/java/android/hardware/SensorManager.java

diff --git a/core/java/android/hardware/SensorManager.java b/core/java/android/hardware/SensorManager.java
index dd4096b..2111cce 100644
--- a/core/java/android/hardware/SensorManager.java
+++ b/core/java/android/hardware/SensorManager.java
@@ -2051,8 +2051,8 @@
         if (rv.length == 4) {
             Q[0] = rv[3];
         } else {
-            //In this case, the w component of the quaternion is known to be a positive number
-            Q[0] = (float)Math.sqrt(1 - rv[0]*rv[0] - rv[1]*rv[1] - rv[2]*rv[2]);
+            Q[0] = 1 - rv[0]*rv[0] - rv[1]*rv[1] - rv[2]*rv[2];
+            Q[0] = (Q[0] > 0) ? (float)Math.sqrt(Q[0]) : 0;
         }
         Q[1] = rv[0];
         Q[2] = rv[1];