Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e7f7af96 authored by Jeff Brown's avatar Jeff Brown Committed by Android Git Automerger
Browse files

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

* commit '35c8ebab':
  take account of RotationVector's new extra parameter
parents ec4c7752 35c8ebab

core/java/android/hardware/SensorManager.java

+2 −2
Original line number Diff line number Diff line
@@ -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];