diff options
4 files changed, 4 insertions, 4 deletions
diff --git a/media/java/android/media/RingtoneManager.java b/media/java/android/media/RingtoneManager.java index 4ec79b7e085a..3e7b8860c818 100644 --- a/media/java/android/media/RingtoneManager.java +++ b/media/java/android/media/RingtoneManager.java @@ -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"))) { diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/helpers/CameraTestUtils.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/helpers/CameraTestUtils.java index e74bda8a6b35..388a65d2a904 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/helpers/CameraTestUtils.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/helpers/CameraTestUtils.java @@ -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> diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/Camera2StillCaptureTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/Camera2StillCaptureTest.java index cbdcc36eea3a..66288f08b5a6 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/Camera2StillCaptureTest.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/Camera2StillCaptureTest.java @@ -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> * diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/CameraMetadataTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/CameraMetadataTest.java index 54442b37d7d9..39add7ea8a42 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/CameraMetadataTest.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/CameraMetadataTest.java @@ -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), |