Merge "AudioPolicy: fix typos"

2 files changed, 4 insertions, 3 deletions

diff --git a/media/java/android/media/AudioManager.java b/media/java/android/media/AudioManager.java
index 7533701138d0..22fa6202df5c 100644
--- a/media/java/android/media/AudioManager.java
+++ b/media/java/android/media/AudioManager.java
@@ -409,7 +409,7 @@ public class AudioManager {
             ADJUST_TOGGLE_MUTE }
             )
     @Retention(RetentionPolicy.SOURCE)
-    public @interface VolumeAdjustement {}
+    public @interface VolumeAdjustment {}
 
     /** @hide */
     public static final String adjustToString(int adj) {
diff --git a/media/java/android/media/audiopolicy/AudioPolicy.java b/media/java/android/media/audiopolicy/AudioPolicy.java
index d0bba6db9db5..4de731a9a8a3 100644
--- a/media/java/android/media/audiopolicy/AudioPolicy.java
+++ b/media/java/android/media/audiopolicy/AudioPolicy.java
@@ -490,9 +490,9 @@ public class AudioPolicy {
         public AudioPolicyVolumeCallback() {}
         /**
          * Called when volume key-related changes are triggered, on the key down event.
-         * @param adjustement the type of volume adjustment for the key.
+         * @param adjustment the type of volume adjustment for the key.
          */
-        public void onVolumeAdjustment(@AudioManager.VolumeAdjustement int adjustement) {}
+        public void onVolumeAdjustment(@AudioManager.VolumeAdjustment int adjustment) {}
     }
 
     private void onPolicyStatusChange() {
@@ -625,6 +625,7 @@ public class AudioPolicy {
                     } else { // should never be null, but don't crash
                         Log.e(TAG, "Invalid null volume event");
                     }
+                    break;
                 default:
                     Log.e(TAG, "Unknown event " + msg.what);
             }