Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "take account of RotationVector's new extra parameter"

Browse Source
This commit is contained in:
Jeff Brown
2014-03-11 00:04:49 +00:00
committed by Gerrit Code Review
parent ab97d617e8 12d39b9ccd
commit 35c8ebab0a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/hardware/SensorManager.java
View File

@@ -1359,7 +1359,7 @@ public abstract class SensorManager {
float q2 = rotationVector[1]; float q2 = rotationVector[1];
float q3 = rotationVector[2]; float q3 = rotationVector[2];
if (rotationVector.length == 4) { if (rotationVector.length >= 4) {
q0 = rotationVector[3]; q0 = rotationVector[3];
} else { } else {
q0 = 1 - q1*q1 - q2*q2 - q3*q3; q0 = 1 - q1*q1 - q2*q2 - q3*q3;
@@ -1416,7 +1416,7 @@ public abstract class SensorManager {
* @param Q an array of floats in which to store the computed quaternion * @param Q an array of floats in which to store the computed quaternion
*/ */
public static void getQuaternionFromVector(float[] Q, float[] rv) { public static void getQuaternionFromVector(float[] Q, float[] rv) {
if (rv.length == 4) { if (rv.length >= 4) {
Q[0] = rv[3]; Q[0] = rv[3];
} else { } else {
Q[0] = 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];