Merge "Merge "Add null check after getApplicationInfo in InstantAppNotifier" am: 56d6691e8e am: f5d40d9afa am: 76665a6498"
diff --git a/core/java/android/view/animation/Transformation.java b/core/java/android/view/animation/Transformation.java
index bd62308..de31667 100644
--- a/core/java/android/view/animation/Transformation.java
+++ b/core/java/android/view/animation/Transformation.java
@@ -158,7 +158,7 @@
}
/**
- * @return The 3x3 Matrix representing the trnasformation to apply to the
+ * @return The 3x3 Matrix representing the transformation to apply to the
* coordinates of the object being animated
*/
public Matrix getMatrix() {
@@ -167,7 +167,7 @@
/**
* Sets the degree of transparency
- * @param alpha 1.0 means fully opaqe and 0.0 means fully transparent
+ * @param alpha 1.0 means fully opaque and 0.0 means fully transparent
*/
public void setAlpha(@FloatRange(from=0.0, to=1.0) float alpha) {
mAlpha = alpha;
diff --git a/core/java/android/window/TransitionInfo.java b/core/java/android/window/TransitionInfo.java
index 5ca29e6..aaaf729 100644
--- a/core/java/android/window/TransitionInfo.java
+++ b/core/java/android/window/TransitionInfo.java
@@ -650,7 +650,7 @@
return options;
}
- public static AnimationOptions makeThumnbnailAnimOptions(HardwareBuffer srcThumb,
+ public static AnimationOptions makeThumbnailAnimOptions(HardwareBuffer srcThumb,
int startX, int startY, boolean scaleUp) {
AnimationOptions options = new AnimationOptions(
scaleUp ? ANIM_THUMBNAIL_SCALE_UP : ANIM_THUMBNAIL_SCALE_DOWN);
diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java
index 8fc3a87..dc53cc6 100644
--- a/services/core/java/com/android/server/wm/ActivityRecord.java
+++ b/services/core/java/com/android/server/wm/ActivityRecord.java
@@ -4536,7 +4536,7 @@
pendingOptions.getStartX(), pendingOptions.getStartY(),
pendingOptions.getAnimationStartedListener(),
scaleUp);
- options = AnimationOptions.makeThumnbnailAnimOptions(buffer,
+ options = AnimationOptions.makeThumbnailAnimOptions(buffer,
pendingOptions.getStartX(), pendingOptions.getStartY(), scaleUp);
startCallback = pendingOptions.getAnimationStartedListener();
if (intent.getSourceBounds() == null && buffer != null) {