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

am 35c8ebab: Merge "take account of RotationVector\'s new extra parameter"

Browse Source 
* commit '35c8ebab0ac66bf2c12b6986f90a07be402e0076':
  take account of RotationVector's new extra parameter
This commit is contained in:
Jeff Brown
2014-03-10 17:08:21 -07:00
committed by Android Git Automerger
parent ec4c7752c2 35c8ebab0a
commit e7f7af964b
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 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];