diff --git a/api/current.txt b/api/current.txt
index 4a96399692aa6..9408c70571312 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -4588,6 +4588,7 @@ package android.app {
     field public static final int DEFAULT_SOUND = 1; // 0x1
     field public static final int DEFAULT_VIBRATE = 2; // 0x2
     field public static final java.lang.String EXTRA_BACKGROUND_IMAGE_URI = "android.backgroundImageUri";
+    field public static final java.lang.String EXTRA_COMPACT_ACTIONS = "android.compactActions";
     field public static final java.lang.String EXTRA_INFO_TEXT = "android.infoText";
     field public static final java.lang.String EXTRA_LARGE_ICON = "android.largeIcon";
     field public static final java.lang.String EXTRA_LARGE_ICON_BIG = "android.largeIcon.big";
diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java
index da59a0338deb9..5782edc3e498b 100644
--- a/core/java/android/app/Notification.java
+++ b/core/java/android/app/Notification.java
@@ -798,6 +798,12 @@ public class Notification implements Parcelable
      */
     public static final String EXTRA_MEDIA_SESSION = "android.mediaSession";
 
+    /**
+     * {@link #extras} key: the indices of actions to be shown in the compact view,
+     * as supplied to (e.g.) {@link MediaStyle#setShowActionsInCompactView(int...)}.
+     */
+    public static final String EXTRA_COMPACT_ACTIONS = "android.compactActions";
+
     /**
      * Value for {@link #EXTRA_AS_HEADS_UP} that indicates this notification should not be
      * displayed in the heads up space.
@@ -3362,6 +3368,9 @@ public class Notification implements Parcelable
             if (mToken != null) {
                 extras.putParcelable(EXTRA_MEDIA_SESSION, mToken);
             }
+            if (mActionsToShowInCompact != null) {
+                extras.putIntArray(EXTRA_COMPACT_ACTIONS, mActionsToShowInCompact);
+            }
         }
 
         private RemoteViews generateMediaActionButton(Action action) {