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

Commit def65d88 authored by Sailendra Doddi's avatar Sailendra Doddi Committed by Android (Google) Code Review
Browse files

Merge changes If362e2ad,I1246175c,Ie4aa961e,I6e69dfcd 

* changes:
  Updated comments using https://source.android.com/setup/contribute/respectful-code
  Updated comments using https://source.android.com/setup/contribute/respectful-code
  Updated comments using https://source.android.com/setup/contribute/respectful-code
  Updated comments using https://source.android.com/setup/contribute/respectful-code
parents 0686c528 bc5b45a4

media/java/android/media/RingtoneManager.java

+1 −1
Original line number Diff line number Diff line
@@ -895,7 +895,7 @@ public class RingtoneManager { 
            throw new IOException("External storage is not mounted. Unable to install ringtones.");

        }



        // Sanity-check: are we actually being asked to install an audio file?

        // Consistency-check: are we actually being asked to install an audio file?

        final String mimeType = mContext.getContentResolver().getType(fileUri);

        if(mimeType == null ||

                !(mimeType.startsWith("audio/") || mimeType.equals("application/ogg"))) {

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

+1 −1
Original line number Diff line number Diff line
@@ -1810,7 +1810,7 @@ public class CameraTestUtils extends Assert { 
    /**

     * Simple validation of JPEG image size and format.

     * <p>

     * Only validate the image object sanity. It is fast, but doesn't actually

     * Only validate the image object consistency. It is fast, but doesn't actually

     * check the buffer data. Assert is used here as it make no sense to

     * continue the test if the jpeg image captured has some serious failures.

     * </p>

media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/Camera2StillCaptureTest.java

+1 −1
Original line number Diff line number Diff line
@@ -572,7 +572,7 @@ public class Camera2StillCaptureTest extends Camera2SurfaceViewTestCase { 
    /**

     * Validate JPEG capture image object soundness and test.

     * <p>

     * In addition to image object sanity, this function also does the decoding

     * In addition to image object consistency, this function also does the decoding

     * test, which is slower.

     * </p>

     *

media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/CameraMetadataTest.java

+1 −1
Original line number Diff line number Diff line
@@ -927,7 +927,7 @@ public class CameraMetadataTest extends junit.framework.TestCase { 
        };

        assertArrayEquals(expectedRaw16Outputs, map.getOutputs(ImageFormat.RAW_SENSOR));



        // Finally, do a round-trip check as a sanity

        // Finally, do a round-trip check for consistency

        checkKeyMarshal(

                "android.scaler.availableInputOutputFormatsMap",

                new ReprocessFormatsMap(contents),