am b20c2e7c: am 477c4fee: Merge "[3163098] Fix bug in angleChange funtion which caused the returned angle change to be zeroall the time. The fix is to use PrevR instead of computing the difference between R and R." into gingerbread
* commit 'b20c2e7ca03f5ef2694b20ff9a7a10a7249eb936':
[3163098] Fix bug in angleChange funtion which caused the returned angle change to be zeroall the time. The fix is to use PrevR instead of computing the difference between R and R.
diff --git a/core/java/android/hardware/SensorManager.java b/core/java/android/hardware/SensorManager.java
index a271075..3f6e4ce 100644
--- a/core/java/android/hardware/SensorManager.java
+++ b/core/java/android/hardware/SensorManager.java
@@ -1872,25 +1872,25 @@
}
if(prevR.length == 9) {
- pri0 = R[0];
- pri1 = R[1];
- pri2 = R[2];
- pri3 = R[3];
- pri4 = R[4];
- pri5 = R[5];
- pri6 = R[6];
- pri7 = R[7];
- pri8 = R[8];
+ pri0 = prevR[0];
+ pri1 = prevR[1];
+ pri2 = prevR[2];
+ pri3 = prevR[3];
+ pri4 = prevR[4];
+ pri5 = prevR[5];
+ pri6 = prevR[6];
+ pri7 = prevR[7];
+ pri8 = prevR[8];
} else if(prevR.length == 16) {
- pri0 = R[0];
- pri1 = R[1];
- pri2 = R[2];
- pri3 = R[4];
- pri4 = R[5];
- pri5 = R[6];
- pri6 = R[8];
- pri7 = R[9];
- pri8 = R[10];
+ pri0 = prevR[0];
+ pri1 = prevR[1];
+ pri2 = prevR[2];
+ pri3 = prevR[4];
+ pri4 = prevR[5];
+ pri5 = prevR[6];
+ pri6 = prevR[8];
+ pri7 = prevR[9];
+ pri8 = prevR[10];
}
// calculate the parts of the rotation difference matrix we need