merge from open-source master

Author: The Android Open Source Project

graphics/java/android/graphics/drawable/RotateDrawable.java

@@ -204,13 +204,27 @@ public void inflate(Resources r, XmlPullParser parser, AttributeSet attrs)
                 com.android.internal.R.styleable.RotateDrawable_visible);
 
         TypedValue tv = a.peekValue(com.android.internal.R.styleable.RotateDrawable_pivotX);
-        boolean pivotXRel = tv.type == TypedValue.TYPE_FRACTION;
-        float pivotX = pivotXRel ? tv.getFraction(1.0f, 1.0f) : tv.getFloat();
+        boolean pivotXRel;
+        float pivotX;
+        if (tv == null) {
+            pivotXRel = true;
+            pivotX = 0.5f;
+        } else {
+            pivotXRel = tv.type == TypedValue.TYPE_FRACTION;
+            pivotX = pivotXRel ? tv.getFraction(1.0f, 1.0f) : tv.getFloat();
+        }
 
         tv = a.peekValue(com.android.internal.R.styleable.RotateDrawable_pivotY);
-        boolean pivotYRel = tv.type == TypedValue.TYPE_FRACTION;
-        float pivotY = pivotYRel ? tv.getFraction(1.0f, 1.0f) : tv.getFloat();
-        
+        boolean pivotYRel;
+        float pivotY;
+        if (tv == null) {
+            pivotYRel = true;
+            pivotY = 0.5f;
+        } else {
+            pivotYRel = tv.type == TypedValue.TYPE_FRACTION;
+            pivotY = pivotYRel ? tv.getFraction(1.0f, 1.0f) : tv.getFloat();
+        }
+
         float fromDegrees = a.getFloat(
                 com.android.internal.R.styleable.RotateDrawable_fromDegrees, 0.0f);
         float toDegrees = a.getFloat(

services/java/com/android/server/WindowManagerService.java

@@ -5355,7 +5355,7 @@ public boolean injectKeyEvent(KeyEvent ev, boolean sync) {
         switch (result) {
             case INJECT_NO_PERMISSION:
                 throw new SecurityException(
-                        "Injecting to another application requires INJECT_EVENT permission");
+                        "Injecting to another application requires INJECT_EVENTS permission");
             case INJECT_SUCCEEDED:
                 return true;
         }
@@ -5383,7 +5383,7 @@ public boolean injectPointerEvent(MotionEvent ev, boolean sync) {
         switch (result) {
             case INJECT_NO_PERMISSION:
                 throw new SecurityException(
-                        "Injecting to another application requires INJECT_EVENT permission");
+                        "Injecting to another application requires INJECT_EVENTS permission");
             case INJECT_SUCCEEDED:
                 return true;
         }
@@ -5411,7 +5411,7 @@ public boolean injectTrackballEvent(MotionEvent ev, boolean sync) {
         switch (result) {
             case INJECT_NO_PERMISSION:
                 throw new SecurityException(
-                        "Injecting to another application requires INJECT_EVENT permission");
+                        "Injecting to another application requires INJECT_EVENTS permission");
             case INJECT_SUCCEEDED:
                 return true;
         }