commit 377f7e286e9b4fccf27bfccb9ac587efcad11992
author Leon Scroggins <scroggo@google.com> Tue Feb 28 19:55:34 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Feb 28 19:55:34 2023 +0000
tree 64ed2faf8933cc8ca83efdef1e7b7b6c9343676c
parent 90bf18e2a7aecf8d3f2a58fc623ab2c0e5bbac4d
parent 9c6d82c50ccfa760ba8a22df1adf1c9895beaf80

Merge "Fix javadoc typos in Color and Context" am: d153fa3fe3 am: 9c6d82c50c

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1238267

Change-Id: If5a4bd325d347eaf1afcfe2b9095976384cd8797
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

core/java/android/content/Context.java

diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java
index d614f30..7de7c67 100644
--- a/core/java/android/content/Context.java
+++ b/core/java/android/content/Context.java
@@ -4040,7 +4040,7 @@
      * <p>Note: When implementing this method, keep in mind that new services can be added on newer
      * Android releases, so if you're looking for just the explicit names mentioned above, make sure
      * to return {@code null} when you don't recognize the name &mdash; if you throw a
-     * {@link RuntimeException} exception instead, you're app might break on new Android releases.
+     * {@link RuntimeException} exception instead, your app might break on new Android releases.
      *
      * @param name The name of the desired service.
      *

graphics/java/android/graphics/Color.java

diff --git a/graphics/java/android/graphics/Color.java b/graphics/java/android/graphics/Color.java
index 87a8053..0f2f879 100644
--- a/graphics/java/android/graphics/Color.java
+++ b/graphics/java/android/graphics/Color.java
@@ -767,7 +767,7 @@
      * Returns the alpha component encoded in the specified color long.
      * The returned value is always in the range \([0..1]\).
      *
-     * @param color The color long whose blue channel to extract
+     * @param color The color long whose alpha channel to extract
      * @return A float value in the range \([0..1]\)
      *
      * @see #colorSpace(long)