diff --git a/policy/com/android/internal/policy/impl/KeyguardViewBase.java b/policy/com/android/internal/policy/impl/KeyguardViewBase.java
index f67f6a9773e4a..2b44d45b1cb35 100644
--- a/policy/com/android/internal/policy/impl/KeyguardViewBase.java
+++ b/policy/com/android/internal/policy/impl/KeyguardViewBase.java
@@ -142,7 +142,7 @@ public abstract class KeyguardViewBase extends FrameLayout {
         final int keyCode = event.getKeyCode();
         if (event.getAction() == KeyEvent.ACTION_DOWN) {
             switch (keyCode) {
-                case KeyEvent.KEYCODE_PLAYPAUSE:
+                case KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE:
                     /* Suppress PLAYPAUSE toggle when phone is ringing or
                      * in-call to avoid music playback */
                     if (mTelephonyManager == null) {
@@ -154,11 +154,11 @@ public abstract class KeyguardViewBase extends FrameLayout {
                         return true;  // suppress key event
                     }
                 case KeyEvent.KEYCODE_HEADSETHOOK: 
-                case KeyEvent.KEYCODE_STOP: 
-                case KeyEvent.KEYCODE_NEXTSONG: 
-                case KeyEvent.KEYCODE_PREVIOUSSONG: 
-                case KeyEvent.KEYCODE_REWIND: 
-                case KeyEvent.KEYCODE_FORWARD: {
+                case KeyEvent.KEYCODE_MEDIA_STOP: 
+                case KeyEvent.KEYCODE_MEDIA_NEXT: 
+                case KeyEvent.KEYCODE_MEDIA_PREVIOUS: 
+                case KeyEvent.KEYCODE_MEDIA_REWIND: 
+                case KeyEvent.KEYCODE_MEDIA_FAST_FORWARD: {
                     Intent intent = new Intent(Intent.ACTION_MEDIA_BUTTON, null);
                     intent.putExtra(Intent.EXTRA_KEY_EVENT, event);
                     getContext().sendOrderedBroadcast(intent, null);
@@ -190,12 +190,12 @@ public abstract class KeyguardViewBase extends FrameLayout {
             switch (keyCode) {
                 case KeyEvent.KEYCODE_MUTE:
                 case KeyEvent.KEYCODE_HEADSETHOOK: 
-                case KeyEvent.KEYCODE_PLAYPAUSE: 
-                case KeyEvent.KEYCODE_STOP: 
-                case KeyEvent.KEYCODE_NEXTSONG: 
-                case KeyEvent.KEYCODE_PREVIOUSSONG: 
-                case KeyEvent.KEYCODE_REWIND: 
-                case KeyEvent.KEYCODE_FORWARD: {
+                case KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE: 
+                case KeyEvent.KEYCODE_MEDIA_STOP: 
+                case KeyEvent.KEYCODE_MEDIA_NEXT: 
+                case KeyEvent.KEYCODE_MEDIA_PREVIOUS: 
+                case KeyEvent.KEYCODE_MEDIA_REWIND: 
+                case KeyEvent.KEYCODE_MEDIA_FAST_FORWARD: {
                     Intent intent = new Intent(Intent.ACTION_MEDIA_BUTTON, null);
                     intent.putExtra(Intent.EXTRA_KEY_EVENT, event);
                     getContext().sendOrderedBroadcast(intent, null);
diff --git a/policy/com/android/internal/policy/impl/KeyguardViewMediator.java b/policy/com/android/internal/policy/impl/KeyguardViewMediator.java
index 71acef90aa83b..a032cb1c6a63d 100644
--- a/policy/com/android/internal/policy/impl/KeyguardViewMediator.java
+++ b/policy/com/android/internal/policy/impl/KeyguardViewMediator.java
@@ -676,12 +676,12 @@ public class KeyguardViewMediator implements KeyguardViewCallback,
             case KeyEvent.KEYCODE_VOLUME_DOWN:
             case KeyEvent.KEYCODE_MUTE:
             case KeyEvent.KEYCODE_HEADSETHOOK: 
-            case KeyEvent.KEYCODE_PLAYPAUSE: 
-            case KeyEvent.KEYCODE_STOP: 
-            case KeyEvent.KEYCODE_NEXTSONG: 
-            case KeyEvent.KEYCODE_PREVIOUSSONG: 
-            case KeyEvent.KEYCODE_REWIND: 
-            case KeyEvent.KEYCODE_FORWARD:
+            case KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE: 
+            case KeyEvent.KEYCODE_MEDIA_STOP: 
+            case KeyEvent.KEYCODE_MEDIA_NEXT: 
+            case KeyEvent.KEYCODE_MEDIA_PREVIOUS: 
+            case KeyEvent.KEYCODE_MEDIA_REWIND: 
+            case KeyEvent.KEYCODE_MEDIA_FAST_FORWARD:
             case KeyEvent.KEYCODE_CAMERA:
                 return false;
         }
diff --git a/policy/com/android/internal/policy/impl/PhoneWindow.java b/policy/com/android/internal/policy/impl/PhoneWindow.java
index 8d9a733335847..da922751b4485 100644
--- a/policy/com/android/internal/policy/impl/PhoneWindow.java
+++ b/policy/com/android/internal/policy/impl/PhoneWindow.java
@@ -1230,7 +1230,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
             }
 
 
-            case KeyEvent.KEYCODE_PLAYPAUSE:
+            case KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE:
                 /* Suppress PLAYPAUSE toggle when phone is ringing or in-call
                  * to avoid music playback */
                 if (mTelephonyManager == null) {
@@ -1243,11 +1243,11 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
                 }
             case KeyEvent.KEYCODE_MUTE:
             case KeyEvent.KEYCODE_HEADSETHOOK:
-            case KeyEvent.KEYCODE_STOP:
-            case KeyEvent.KEYCODE_NEXTSONG:
-            case KeyEvent.KEYCODE_PREVIOUSSONG:
-            case KeyEvent.KEYCODE_REWIND:
-            case KeyEvent.KEYCODE_FORWARD: {
+            case KeyEvent.KEYCODE_MEDIA_STOP:
+            case KeyEvent.KEYCODE_MEDIA_NEXT:
+            case KeyEvent.KEYCODE_MEDIA_PREVIOUS:
+            case KeyEvent.KEYCODE_MEDIA_REWIND:
+            case KeyEvent.KEYCODE_MEDIA_FAST_FORWARD: {
                 Intent intent = new Intent(Intent.ACTION_MEDIA_BUTTON, null);
                 intent.putExtra(Intent.EXTRA_KEY_EVENT, event);
                 getContext().sendOrderedBroadcast(intent, null);
@@ -1370,12 +1370,12 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
             }
 
             case KeyEvent.KEYCODE_HEADSETHOOK:
-            case KeyEvent.KEYCODE_PLAYPAUSE:
-            case KeyEvent.KEYCODE_STOP:
-            case KeyEvent.KEYCODE_NEXTSONG:
-            case KeyEvent.KEYCODE_PREVIOUSSONG:
-            case KeyEvent.KEYCODE_REWIND:
-            case KeyEvent.KEYCODE_FORWARD: {
+            case KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE:
+            case KeyEvent.KEYCODE_MEDIA_STOP:
+            case KeyEvent.KEYCODE_MEDIA_NEXT:
+            case KeyEvent.KEYCODE_MEDIA_PREVIOUS:
+            case KeyEvent.KEYCODE_MEDIA_REWIND:
+            case KeyEvent.KEYCODE_MEDIA_FAST_FORWARD: {
                 Intent intent = new Intent(Intent.ACTION_MEDIA_BUTTON, null);
                 intent.putExtra(Intent.EXTRA_KEY_EVENT, event);
                 getContext().sendOrderedBroadcast(intent, null);
diff --git a/policy/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/com/android/internal/policy/impl/PhoneWindowManager.java
index 95dda57eb1adb..21c3267c1e91b 100644
--- a/policy/com/android/internal/policy/impl/PhoneWindowManager.java
+++ b/policy/com/android/internal/policy/impl/PhoneWindowManager.java
@@ -1385,12 +1385,12 @@ public class PhoneWindowManager implements WindowManagerPolicy {
     
     static boolean isMediaKey(int code) {
         if (code == KeyEvent.KEYCODE_HEADSETHOOK || 
-                code == KeyEvent.KEYCODE_PLAYPAUSE ||
-                code == KeyEvent.KEYCODE_STOP || 
-                code == KeyEvent.KEYCODE_NEXTSONG ||
-                code == KeyEvent.KEYCODE_PREVIOUSSONG || 
-                code == KeyEvent.KEYCODE_PREVIOUSSONG ||
-                code == KeyEvent.KEYCODE_FORWARD) {
+                code == KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE ||
+                code == KeyEvent.KEYCODE_MEDIA_STOP || 
+                code == KeyEvent.KEYCODE_MEDIA_NEXT ||
+                code == KeyEvent.KEYCODE_MEDIA_PREVIOUS || 
+                code == KeyEvent.KEYCODE_MEDIA_PREVIOUS ||
+                code == KeyEvent.KEYCODE_MEDIA_FAST_FORWARD) {
             return true;
         }
         return false;