Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9eb69e9e authored by Hai Zhang's avatar Hai Zhang
Browse files

Use separate config entries for default role holders. 

Using a single config_defaultRoleHolders turned out to be problematic
and error-prone when mixed with multiple overlays, so split it into
separate config entries.

Bug: 122730135
Test: build
Change-Id: If5c3b54aab6cf86223dc428cd838a1e07d6036ab
parent 0b5a809d

api/system-current.txt

+4 −1
Original line number Diff line number Diff line
@@ -201,7 +201,6 @@ package android { 
  }















  public static final class R.array {













    field public static final int config_defaultRoleHolders = 17235974; // 0x1070006















    field public static final int config_keySystemUuidMapping = 17235973; // 0x1070005















  }
























@@ -237,6 +236,10 @@ package android {













  }





























  public static final class R.string {













    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_defaultSms = 17039396; // 0x1040024















    field public static final int config_feedbackIntentExtraKey = 17039391; // 0x104001f















    field public static final int config_feedbackIntentNameKey = 17039392; // 0x1040020















    field public static final int config_helpIntentExtraKey = 17039389; // 0x104001d

































api/test-current.txt



+3
−2




























Original line number
Diff line number
Diff line








@@ -17,8 +17,9 @@ package android {













    field public static final String WRITE_OBB = "android.permission.WRITE_OBB";















  }





























  public static final class R.array {













    field public static final int config_defaultRoleHolders = 17235974; // 0x1070006













  public static final class R.string {













    field public static final int config_defaultAssistant = 17039393; // 0x1040021













    field public static final int config_defaultDialer = 17039395; // 0x1040023















  }































}

































core/res/res/values/config.xml



+21
−9




























Original line number
Diff line number
Diff line








@@ -1921,8 +1921,6 @@













               cell broadcasting sms, and MMS. -->















    <bool name="config_sms_capable">true</bool>





























    <!-- TODO: STOPSHIP(b/110557011): Remove this from framework and overlays as we use













         config_defaultRoleHolders now. -->















    <!-- Default SMS Application. This will be the default SMS application when















         the phone first boots. The user can then change the default app to one















         of their choosing.









@@ -1930,15 +1928,29 @@













         application is desired.































         If this string is empty or the specified package does not exist, then













         the platform will search for an SMS app and use that (if there is one)-->













         the platform will search for an SMS app and use that (if there is one)



























         Note: This config is deprecated, please use config_defaultSms instead. -->















    <string name="default_sms_application" translatable="false">com.android.messaging</string>





























    <!-- Default role holders. This will be an array of roles and package names of their default













         holders, with each item in the format of "ROLE_NAME: PACKAGE_NAME_1, PACKAGE_NAME_2". -->













    <string-array name="config_defaultRoleHolders" translatable="false">













        <item>android.app.role.SMS: com.android.messaging</item>













        <item>android.app.role.DIALER: com.android.phone</item>













    </string-array>













    <!-- Default web browser.  This is the package name of the application that will













         be the default browser when the device first boots.  Afterwards the user













         can select whatever browser app they wish to use as the default.



























         If this string is empty or the specified package does not exist, then













         the behavior will be as though no app was named as an explicit default.



























         Note: This config is deprecated, please use config_defaultBrowser instead. -->













    <string name="default_browser" translatable="false"></string>



























    <!-- The name of the package that will hold the assistant role by default. -->













    <string name="config_defaultAssistant" translatable="false" />













    <!-- The name of the package that will hold the browser role by default. -->













    <string name="config_defaultBrowser" translatable="false">@string/default_browser</string>













    <!-- The name of the package that will hold the dialer role by default. -->













    <string name="config_defaultDialer" translatable="false">com.android.phone</string>













    <!-- The name of the package that will hold the SMS role by default. -->













    <string name="config_defaultSms" translatable="false">@string/default_sms_application</string>































    <!-- Enable/disable default bluetooth profiles:















        HSP_AG, ObexObjectPush, Audio, NAP -->

































core/res/res/values/public.xml



+8
−5




























Original line number
Diff line number
Diff line








@@ -2971,6 +2971,14 @@













        <public name="config_feedbackIntentExtraKey" />















        <!-- @hide @SystemApi -->















        <public name="config_feedbackIntentNameKey" />













      <!-- @hide @SystemApi @TestApi -->













      <public name="config_defaultAssistant" />













      <!-- @hide @SystemApi -->













      <public name="config_defaultBrowser" />













      <!-- @hide @SystemApi @TestApi -->













      <public name="config_defaultDialer" />













      <!-- @hide @SystemApi -->













      <public name="config_defaultSms" />















    </public-group>































    <public-group type="bool" first-id="0x01110000">









@@ -2990,11 +2998,6 @@













        <public name="system_notification_accent_color" />















    </public-group>





























    <public-group type="array" first-id="0x01070006">













      <!-- @hide @TestApi @SystemApi -->













      <public name="config_defaultRoleHolders" />













    </public-group>





























  <!-- ===============================================================















       DO NOT ADD UN-GROUPED ITEMS HERE

















































core/res/res/values/symbols.xml



+1
−0




























Original line number
Diff line number
Diff line








@@ -1034,6 +1034,7 @@













  <java-symbol type="string" name="sipAddressTypeOther" />















  <java-symbol type="string" name="sipAddressTypeWork" />















  <java-symbol type="string" name="default_sms_application" />













  <java-symbol type="string" name="default_browser" />















  <java-symbol type="string" name="sms_control_message" />















  <java-symbol type="string" name="sms_control_title" />















  <java-symbol type="string" name="sms_control_no" />