From 24e596828137b4d75b54fe4b4e3b731c666defe0 Mon Sep 17 00:00:00 2001
From: Hai Zhang <zhanghai@google.com>
Date: Thu, 11 Apr 2019 11:50:03 +0800
Subject: Remove config entries for music and gallery role.

Bug: 128861807
Test: presubmit
Change-Id: I2c5bff6f382b02994a7eefd47811dce35d69a1c9
---
 api/system-current.txt         | 2 --
 core/res/res/values/config.xml | 4 ----
 core/res/res/values/public.xml | 4 ----
 3 files changed, 10 deletions(-)

diff --git a/api/system-current.txt b/api/system-current.txt
index 76b8f6610590..d1c0984258d1 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -254,8 +254,6 @@ package android {
     field public static final int config_defaultAssistant = 17039393; // 0x1040021
     field public static final int config_defaultBrowser = 17039394; // 0x1040022
     field public static final int config_defaultDialer = 17039395; // 0x1040023
-    field public static final int config_defaultGallery = 17039398; // 0x1040026
-    field public static final int config_defaultMusic = 17039397; // 0x1040025
     field public static final int config_defaultSms = 17039396; // 0x1040024
     field public static final int config_feedbackIntentExtraKey = 17039391; // 0x104001f
     field public static final int config_feedbackIntentNameKey = 17039392; // 0x1040020
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 0163fc0e20ce..0b22b50b8314 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -1967,10 +1967,6 @@
     <bool name="config_showDefaultEmergency">false</bool>
     <!-- Whether the default home settings should be shown. -->
     <bool name="config_showDefaultHome">true</bool>
-    <!-- The name of the package that will hold the music role by default. -->
-    <string name="config_defaultMusic" translatable="false">com.android.music</string>
-    <!-- The name of the package that will hold the gallery role by default. -->
-    <string name="config_defaultGallery" translatable="false">com.android.gallery3d</string>
 
     <!-- Enable/disable default bluetooth profiles:
         HSP_AG, ObexObjectPush, Audio, NAP -->
diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml
index 3bbc03f17efc..db773737dd60 100644
--- a/core/res/res/values/public.xml
+++ b/core/res/res/values/public.xml
@@ -2985,10 +2985,6 @@
       <public name="config_defaultDialer" />
       <!-- @hide @SystemApi -->
       <public name="config_defaultSms" />
-      <!-- @hide @SystemApi -->
-      <public name="config_defaultMusic" />
-      <!-- @hide @SystemApi -->
-      <public name="config_defaultGallery" />
     </public-group>
 
     <public-group type="bool" first-id="0x01110000">
-- 
cgit v1.2.3-59-g8ed1b