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

Commit 61fc070c authored by Fabián Cañas's avatar Fabián Cañas Committed by Automerger Merge Worker
Browse files

Merge "Fix typos found by linter" into main am: 407ba05c 

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



Change-Id: I1f1bffa605a1cf8951f69412789a73a5a138415c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8e8e6de9 407ba05c

media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/helpers/CameraTestUtils.java

+2 −2
Original line number Diff line number Diff line
@@ -1709,7 +1709,7 @@ public class CameraTestUtils extends Assert { 
     * <p>

     * Two images are strongly equal if and only if the data, formats, sizes,

     * and timestamps are same. For {@link ImageFormat#PRIVATE PRIVATE} format

     * images, the image data is not not accessible thus the data comparison is

     * images, the image data is not accessible thus the data comparison is

     * effectively skipped as the number of planes is zero.

     * </p>

     * <p>
@@ -2049,7 +2049,7 @@ public class CameraTestUtils extends Assert { 
                    }

                } else {

                    // Case 2.

                    collector.expectEquals("Exif orientaiton should match requested orientation",

                    collector.expectEquals("Exif orientation should match requested orientation",

                            requestedOrientation, getExifOrientationInDegree(exifOrientation,

                            collector));

                }

media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/helpers/StaticMetadata.java

+2 −2
Original line number Diff line number Diff line
@@ -1127,8 +1127,8 @@ public class StaticMetadata { 
     * Get aeAvailableModes and do the validation check.

     *

     * <p>Depending on the check level this class has, for WAR or COLLECT levels,

     * If the aeMode list is invalid, return an empty mode array. The the caller doesn't

     * have to abort the execution even the aeMode list is invalid.</p>

     * If the aeMode list is invalid, return an empty mode array. The caller doesn't

     * have to abort the execution even if the aeMode list is invalid.</p>

     * @return AE available modes

     */

    public int[] getAeAvailableModesChecked() {