Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dec0c28a authored by Ryan Tao's avatar Ryan Tao Committed by Automerger Merge Worker
Browse files

Merge "Fix "the the" typo in one file, this is for completing the AEP Cider G... 

Merge "Fix "the the" typo in one file, this is for completing the AEP Cider G exercise" into main am: c86fc47c am: 15dc62b5

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



Change-Id: Id97f45012d16f0d75aebb21da6ec5e593abc37d8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c7db9c3e 15dc62b5

graphics/java/android/view/PixelCopy.java

+6 −6
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ public final class PixelCopy { 
     *

     * The contents of the source will be scaled to fit exactly inside the bitmap.

     * The pixel format of the source buffer will be converted, as part of the copy,

     * to fit the the bitmap's {@link Bitmap.Config}. The most recently queued buffer

     * to fit the bitmap's {@link Bitmap.Config}. The most recently queued buffer

     * in the SurfaceView's Surface will be used as the source of the copy.

     *

     * @param source The source from which to copy
@@ -117,7 +117,7 @@ public final class PixelCopy { 
     *

     * The contents of the source will be scaled to fit exactly inside the bitmap.

     * The pixel format of the source buffer will be converted, as part of the copy,

     * to fit the the bitmap's {@link Bitmap.Config}. The most recently queued buffer

     * to fit the bitmap's {@link Bitmap.Config}. The most recently queued buffer

     * in the SurfaceView's Surface will be used as the source of the copy.

     *

     * @param source The source from which to copy
@@ -143,7 +143,7 @@ public final class PixelCopy { 
     *

     * The contents of the source will be scaled to fit exactly inside the bitmap.

     * The pixel format of the source buffer will be converted, as part of the copy,

     * to fit the the bitmap's {@link Bitmap.Config}. The most recently queued buffer

     * to fit the bitmap's {@link Bitmap.Config}. The most recently queued buffer

     * in the Surface will be used as the source of the copy.

     *

     * @param source The source from which to copy
@@ -164,7 +164,7 @@ public final class PixelCopy { 
     *

     * The contents of the source rect will be scaled to fit exactly inside the bitmap.

     * The pixel format of the source buffer will be converted, as part of the copy,

     * to fit the the bitmap's {@link Bitmap.Config}. The most recently queued buffer

     * to fit the bitmap's {@link Bitmap.Config}. The most recently queued buffer

     * in the Surface will be used as the source of the copy.

     *

     * @param source The source from which to copy
@@ -201,7 +201,7 @@ public final class PixelCopy { 
     *

     * The contents of the source will be scaled to fit exactly inside the bitmap.

     * The pixel format of the source buffer will be converted, as part of the copy,

     * to fit the the bitmap's {@link Bitmap.Config}. The most recently queued buffer

     * to fit the bitmap's {@link Bitmap.Config}. The most recently queued buffer

     * in the Window's Surface will be used as the source of the copy.

     *

     * Note: This is limited to being able to copy from Window's with a non-null
@@ -231,7 +231,7 @@ public final class PixelCopy { 
     *

     * The contents of the source rect will be scaled to fit exactly inside the bitmap.

     * The pixel format of the source buffer will be converted, as part of the copy,

     * to fit the the bitmap's {@link Bitmap.Config}. The most recently queued buffer

     * to fit the bitmap's {@link Bitmap.Config}. The most recently queued buffer

     * in the Window's Surface will be used as the source of the copy.

     *

     * Note: This is limited to being able to copy from Window's with a non-null