merge from open-source master
diff --git a/graphics/java/android/graphics/ColorMatrix.java b/graphics/java/android/graphics/ColorMatrix.java
index 2478712e..c22cda1 100644
--- a/graphics/java/android/graphics/ColorMatrix.java
+++ b/graphics/java/android/graphics/ColorMatrix.java
@@ -110,22 +110,31 @@
a[18] = aScale;
}
+ /**
+ * Set the rotation on a color axis by the specified values.
+ * axis=0 correspond to a rotation around the RED color
+ * axis=1 correspond to a rotation around the GREEN color
+ * axis=2 correspond to a rotation around the BLUE color
+ */
public void setRotate(int axis, float degrees) {
reset();
float radians = degrees * (float)Math.PI / 180;
float cosine = FloatMath.cos(radians);
float sine = FloatMath.sin(radians);
switch (axis) {
+ // Rotation around the red color
case 0:
mArray[6] = mArray[12] = cosine;
mArray[7] = sine;
mArray[11] = -sine;
break;
+ // Rotation around the green color
case 1:
- mArray[0] = mArray[17] = cosine;
- mArray[2] = sine;
- mArray[15] = -sine;
+ mArray[0] = mArray[12] = cosine;
+ mArray[2] = -sine;
+ mArray[10] = sine;
break;
+ // Rotation around the blue color
case 2:
mArray[0] = mArray[6] = cosine;
mArray[1] = sine;
diff --git a/services/java/com/android/server/LocationManagerService.java b/services/java/com/android/server/LocationManagerService.java
index bbb43d7..4c3893c 100644
--- a/services/java/com/android/server/LocationManagerService.java
+++ b/services/java/com/android/server/LocationManagerService.java
@@ -1315,7 +1315,7 @@
/**
* @return null if the provider does not exits
- * @throw SecurityException if the provider is not allowed to be
+ * @throws SecurityException if the provider is not allowed to be
* accessed by the caller
*/
public Bundle getProviderInfo(String provider) {