diff options
| author | Jeff Brown <jeffbrown@android.com> | 2014-03-11 00:37:53 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-11 00:37:53 +0000 |
| commit | 22c38e67d4e49f5f660f50fa4e1bd6359024cb91 (patch) | |
| tree | da55af65e0d3a56d3e66d9eda8ec09ee2249ed86 | |
| parent | 7246fa56100c186df0c094e21a5d06a3d9545900 (diff) | |
| parent | 3c6bb4d4ec58d03f023280c8be8d95d984c8d1f1 (diff) | |
| download | frameworks_base-22c38e67d4e49f5f660f50fa4e1bd6359024cb91.zip frameworks_base-22c38e67d4e49f5f660f50fa4e1bd6359024cb91.tar.gz frameworks_base-22c38e67d4e49f5f660f50fa4e1bd6359024cb91.tar.bz2 | |
am 3c6bb4d4: am f2e837e5: am e7f7af96: am 35c8ebab: Merge "take account of RotationVector\'s new extra parameter"
* commit '3c6bb4d4ec58d03f023280c8be8d95d984c8d1f1':
take account of RotationVector's new extra parameter
| -rw-r--r-- | core/java/android/hardware/SensorManager.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/hardware/SensorManager.java b/core/java/android/hardware/SensorManager.java index 8c23129..5f2b5f0 100644 --- a/core/java/android/hardware/SensorManager.java +++ b/core/java/android/hardware/SensorManager.java @@ -1359,7 +1359,7 @@ public abstract class SensorManager { float q2 = rotationVector[1]; float q3 = rotationVector[2]; - if (rotationVector.length == 4) { + if (rotationVector.length >= 4) { q0 = rotationVector[3]; } else { 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 */ public static void getQuaternionFromVector(float[] Q, float[] rv) { - if (rv.length == 4) { + if (rv.length >= 4) { Q[0] = rv[3]; } else { Q[0] = 1 - rv[0]*rv[0] - rv[1]*rv[1] - rv[2]*rv[2]; |