diff options
| author | Jeff Brown <jeffbrown@android.com> | 2014-03-10 17:08:21 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-10 17:08:21 -0700 |
| commit | e7f7af964baa3c5d36abd163e33ad139310049d2 (patch) | |
| tree | 8eac6a3ec44393d6ac2fcbddcb32965326eb0da5 | |
| parent | ec4c7752c22ae26924378d953a6f4a0e8e8b036d (diff) | |
| parent | 35c8ebab0ac66bf2c12b6986f90a07be402e0076 (diff) | |
| download | frameworks_base-e7f7af964baa3c5d36abd163e33ad139310049d2.zip frameworks_base-e7f7af964baa3c5d36abd163e33ad139310049d2.tar.gz frameworks_base-e7f7af964baa3c5d36abd163e33ad139310049d2.tar.bz2 | |
am 35c8ebab: Merge "take account of RotationVector\'s new extra parameter"
* commit '35c8ebab0ac66bf2c12b6986f90a07be402e0076':
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 b931313..ac9189d 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]; |