diff --git a/api/current.txt b/api/current.txt
index f78dfde30c3e8..5aa42d4db9257 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -7443,9 +7443,7 @@ package android.app.role {
     field public static final String ROLE_CALL_SCREENING = "android.app.role.CALL_SCREENING";
     field public static final String ROLE_DIALER = "android.app.role.DIALER";
     field public static final String ROLE_EMERGENCY = "android.app.role.EMERGENCY";
-    field public static final String ROLE_GALLERY = "android.app.role.GALLERY";
     field public static final String ROLE_HOME = "android.app.role.HOME";
-    field public static final String ROLE_MUSIC = "android.app.role.MUSIC";
     field public static final String ROLE_SMS = "android.app.role.SMS";
   }
 
diff --git a/core/java/android/app/role/RoleManager.java b/core/java/android/app/role/RoleManager.java
index d1f8ed20cf0fe..87597a7bf5f3e 100644
--- a/core/java/android/app/role/RoleManager.java
+++ b/core/java/android/app/role/RoleManager.java
@@ -112,20 +112,6 @@ public final class RoleManager {
      */
     public static final String ROLE_HOME = "android.app.role.HOME";
 
-    /**
-     * The name of the music player role.
-     *
-     * @see Intent#CATEGORY_APP_MUSIC
-     */
-    public static final String ROLE_MUSIC = "android.app.role.MUSIC";
-
-    /**
-     * The name of the gallery role.
-     *
-     * @see Intent#CATEGORY_APP_GALLERY
-     */
-    public static final String ROLE_GALLERY = "android.app.role.GALLERY";
-
     /**
      * The name of the car mode dialer app role.
      * <p>