diff --git a/include/media/AudioSystem.h b/include/media/AudioSystem.h
index 0ea04a4..1243502 100644
--- a/include/media/AudioSystem.h
+++ b/include/media/AudioSystem.h
@@ -103,15 +103,15 @@
     // Channel mask definitions must be kept in sync with JAVA values in /media/java/android/media/AudioFormat.java
     enum audio_channels {
         // output channels
-        CHANNEL_OUT_FRONT_LEFT = 0x1,
-        CHANNEL_OUT_FRONT_RIGHT = 0x2,
-        CHANNEL_OUT_FRONT_CENTER = 0x4,
-        CHANNEL_OUT_LOW_FREQUENCY = 0x8,
-        CHANNEL_OUT_BACK_LEFT = 0x10,
-        CHANNEL_OUT_BACK_RIGHT = 0x20,
-        CHANNEL_OUT_FRONT_LEFT_OF_CENTER = 0x40,
-        CHANNEL_OUT_FRONT_RIGHT_OF_CENTER = 0x80,
-        CHANNEL_OUT_BACK_CENTER = 0x100,
+        CHANNEL_OUT_FRONT_LEFT = 0x4,
+        CHANNEL_OUT_FRONT_RIGHT = 0x8,
+        CHANNEL_OUT_FRONT_CENTER = 0x10,
+        CHANNEL_OUT_LOW_FREQUENCY = 0x20,
+        CHANNEL_OUT_BACK_LEFT = 0x40,
+        CHANNEL_OUT_BACK_RIGHT = 0x80,
+        CHANNEL_OUT_FRONT_LEFT_OF_CENTER = 0x100,
+        CHANNEL_OUT_FRONT_RIGHT_OF_CENTER = 0x200,
+        CHANNEL_OUT_BACK_CENTER = 0x400,
         CHANNEL_OUT_MONO = CHANNEL_OUT_FRONT_LEFT,
         CHANNEL_OUT_STEREO = (CHANNEL_OUT_FRONT_LEFT | CHANNEL_OUT_FRONT_RIGHT),
         CHANNEL_OUT_QUAD = (CHANNEL_OUT_FRONT_LEFT | CHANNEL_OUT_FRONT_RIGHT |
@@ -128,20 +128,20 @@
                 CHANNEL_OUT_FRONT_LEFT_OF_CENTER | CHANNEL_OUT_FRONT_RIGHT_OF_CENTER | CHANNEL_OUT_BACK_CENTER),
 
         // input channels
-        CHANNEL_IN_LEFT = 0x10000,
-        CHANNEL_IN_RIGHT = 0x20000,
-        CHANNEL_IN_FRONT = 0x40000,
-        CHANNEL_IN_BACK = 0x80000,
-        CHANNEL_IN_LEFT_PROCESSED = 0x100000,
-        CHANNEL_IN_RIGHT_PROCESSED = 0x200000,
-        CHANNEL_IN_FRONT_PROCESSED = 0x400000,
-        CHANNEL_IN_BACK_PROCESSED = 0x800000,
-        CHANNEL_IN_PRESSURE = 0x1000000,
-        CHANNEL_IN_X_AXIS = 0x2000000,
-        CHANNEL_IN_Y_AXIS = 0x4000000,
-        CHANNEL_IN_Z_AXIS = 0x8000000,
-        CHANNEL_IN_VOICE_UPLINK = 0x10000000,
-        CHANNEL_IN_VOICE_DNLINK = 0x20000000,
+        CHANNEL_IN_LEFT = 0x4,
+        CHANNEL_IN_RIGHT = 0x8,
+        CHANNEL_IN_FRONT = 0x10,
+        CHANNEL_IN_BACK = 0x20,
+        CHANNEL_IN_LEFT_PROCESSED = 0x40,
+        CHANNEL_IN_RIGHT_PROCESSED = 0x80,
+        CHANNEL_IN_FRONT_PROCESSED = 0x100,
+        CHANNEL_IN_BACK_PROCESSED = 0x200,
+        CHANNEL_IN_PRESSURE = 0x400,
+        CHANNEL_IN_X_AXIS = 0x800,
+        CHANNEL_IN_Y_AXIS = 0x1000,
+        CHANNEL_IN_Z_AXIS = 0x2000,
+        CHANNEL_IN_VOICE_UPLINK = 0x4000,
+        CHANNEL_IN_VOICE_DNLINK = 0x8000,
         CHANNEL_IN_MONO = CHANNEL_IN_FRONT,
         CHANNEL_IN_STEREO = (CHANNEL_IN_LEFT | CHANNEL_IN_RIGHT),
         CHANNEL_IN_ALL = (CHANNEL_IN_LEFT | CHANNEL_IN_RIGHT | CHANNEL_IN_FRONT | CHANNEL_IN_BACK|