summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Mathias Agopian <mathias@google.com> 2011-03-07 17:49:54 -0800
committer Mathias Agopian <mathias@google.com> 2011-03-07 17:58:34 -0800
commit241d8a84e549c40190ecbbfeb63078293c49dfb0 (patch)
treec6733e22422770b96ce87a647fa3889cbf44f226
parentff5a09904fb05f2776f1bbf1dd3915f38031190c (diff)
fix [4026375] SensorManager quaternion functions can call sqrt with a negative number [DO NOT MERGE]
Just make sure to clamp the argument to zero. Bug: 4026375 Change-Id: Idd3d4ef977e87c1b3f6b54371105c3152d7dc6b9
-rw-r--r--core/java/android/hardware/SensorManager.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/hardware/SensorManager.java b/core/java/android/hardware/SensorManager.java
index f079e42a9993..cc821709d849 100644
--- a/core/java/android/hardware/SensorManager.java
+++ b/core/java/android/hardware/SensorManager.java
@@ -2026,8 +2026,8 @@ public class SensorManager
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];