diff options
| author | 2024-03-25 17:49:07 +0000 | |
|---|---|---|
| committer | 2024-03-25 17:49:07 +0000 | |
| commit | ef4084554c7efb96b95f930376c69a467243c405 (patch) | |
| tree | 85724e86e69e945cbb9492cc852d7c9ee6b575a0 | |
| parent | 6b5f891f7763c8eb3fcac1cd4d1de15571efe623 (diff) | |
| parent | 3de3b3f97c42e8d8f76f8adbed9a641c1f4b9259 (diff) | |
Merge "Fix common typo" into main am: 3de3b3f97c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3005863
Change-Id: I61d1556f6ad108db36cd10ec5b5c5ce9a5ac8d0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | media/java/android/media/AudioDescriptor.java | 2 | ||||
| -rw-r--r-- | media/java/android/media/AudioManager.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/media/java/android/media/AudioDescriptor.java b/media/java/android/media/AudioDescriptor.java index 85a653c9d80c..b5cae2c5ef10 100644 --- a/media/java/android/media/AudioDescriptor.java +++ b/media/java/android/media/AudioDescriptor.java @@ -99,7 +99,7 @@ public class AudioDescriptor implements Parcelable { * When encapsulation is required, only playback with {@link android.media.AudioTrack} API is * supported. But playback with {@link android.media.MediaPlayer} is not. * When an encapsulation type is required, the {@link AudioFormat} encoding selected when - * creating the {@link AudioTrack} must match the encapsulation type, e.g + * creating the {@link AudioTrack} must match the encapsulation type, e.g. * AudioFormat#ENCODING_IEC61937 for AudioProfile.AUDIO_ENCAPSULATION_TYPE_IEC61937. * * @return an integer representing the encapsulation type diff --git a/media/java/android/media/AudioManager.java b/media/java/android/media/AudioManager.java index 3dfd5726455d..cff5f20669d2 100644 --- a/media/java/android/media/AudioManager.java +++ b/media/java/android/media/AudioManager.java @@ -3460,7 +3460,7 @@ public class AudioManager { /* modes for setMode/getMode/setRoute/getRoute */ /** - * Audio harware modes. + * Audio hardware modes. */ /** * Invalid audio mode. |