Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes If362e2ad,I1246175c,Ie4aa961e,I6e69dfcd

Browse Source 
* 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
This commit is contained in:
Sailendra Doddi
2021-07-26 10:32:19 +00:00
committed by Android (Google) Code Review
parent 0686c5283d bc5b45a4bf
commit def65d889c
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
media/java/android/media/RingtoneManager.java
View File

@@ -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"))) {

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

@@ -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>

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

@@ -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>
*

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

@@ -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),