diff options
author | 2019-04-05 18:13:14 +0000 | |
---|---|---|
committer | 2019-04-05 18:13:14 +0000 | |
commit | ddb9bb211c06fddace52ac64bff91e9e9780df8c (patch) | |
tree | 3bb70f62ec5a06d5f7809ef5bc6e8de553dc7989 | |
parent | 08f584170751ade4161a343fdd614cc8f2ea1f7b (diff) | |
parent | 206445526b0fcfd149fa8a81a049b0fc33080406 (diff) |
Merge "Remove Gallery and Music role" into qt-dev
-rw-r--r-- | api/current.txt | 2 | ||||
-rw-r--r-- | core/java/android/app/role/RoleManager.java | 14 |
2 files changed, 0 insertions, 16 deletions
diff --git a/api/current.txt b/api/current.txt index 9776a11d62d7..0eb6447ce291 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 d1f8ed20cf0f..87597a7bf5f3 100644 --- a/core/java/android/app/role/RoleManager.java +++ b/core/java/android/app/role/RoleManager.java @@ -113,20 +113,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> * Similar to the {@link #ROLE_DIALER dialer} role, this role determines which app is |