diff --git a/api/current.xml b/api/current.xml
index ee793f87b15ab..73332fc9c4fc3 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -92970,7 +92970,7 @@
 >
 </field>
 <field name="PRESET_LARGEHALL"
- type="int"
+ type="short"
  transient="false"
  volatile="false"
  value="5"
@@ -92981,7 +92981,7 @@
 >
 </field>
 <field name="PRESET_LARGEROOM"
- type="int"
+ type="short"
  transient="false"
  volatile="false"
  value="3"
@@ -92992,7 +92992,7 @@
 >
 </field>
 <field name="PRESET_MEDIUMHALL"
- type="int"
+ type="short"
  transient="false"
  volatile="false"
  value="4"
@@ -93003,7 +93003,7 @@
 >
 </field>
 <field name="PRESET_MEDIUMROOM"
- type="int"
+ type="short"
  transient="false"
  volatile="false"
  value="2"
@@ -93014,7 +93014,7 @@
 >
 </field>
 <field name="PRESET_NONE"
- type="int"
+ type="short"
  transient="false"
  volatile="false"
  value="0"
@@ -93025,7 +93025,7 @@
 >
 </field>
 <field name="PRESET_PLATE"
- type="int"
+ type="short"
  transient="false"
  volatile="false"
  value="6"
@@ -93036,7 +93036,7 @@
 >
 </field>
 <field name="PRESET_SMALLROOM"
- type="int"
+ type="short"
  transient="false"
  volatile="false"
  value="1"
diff --git a/media/java/android/media/PresetReverb.java b/media/java/android/media/PresetReverb.java
index 1ec36fc9f2dd8..65175ffdb7227 100644
--- a/media/java/android/media/PresetReverb.java
+++ b/media/java/android/media/PresetReverb.java
@@ -71,31 +71,31 @@ public class PresetReverb extends AudioEffect {
     /**
      * No reverb or reflections
      */
-    public static final int PRESET_NONE        = 0;
+    public static final short PRESET_NONE        = 0;
     /**
      * Reverb preset representing a small room less than five meters in length
      */
-    public static final int PRESET_SMALLROOM   = 1;
+    public static final short PRESET_SMALLROOM   = 1;
     /**
      * Reverb preset representing a medium room with a length of ten meters or less
      */
-    public static final int PRESET_MEDIUMROOM  = 2;
+    public static final short PRESET_MEDIUMROOM  = 2;
     /**
      * Reverb preset representing a large-sized room suitable for live performances
      */
-    public static final int PRESET_LARGEROOM   = 3;
+    public static final short PRESET_LARGEROOM   = 3;
     /**
      * Reverb preset representing a medium-sized hall
      */
-    public static final int PRESET_MEDIUMHALL  = 4;
+    public static final short PRESET_MEDIUMHALL  = 4;
     /**
      * Reverb preset representing a large-sized hall suitable for a full orchestra
      */
-    public static final int PRESET_LARGEHALL   = 5;
+    public static final short PRESET_LARGEHALL   = 5;
     /**
      * Reverb preset representing a synthesis of the traditional plate reverb
      */
-    public static final int PRESET_PLATE       = 6;
+    public static final short PRESET_PLATE       = 6;
 
     /**
      * Registered listener for parameter changes.