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

Commit a585180c authored by Jack Yu's avatar Jack Yu Committed by Android (Google) Code Review
Browse files

Merge "Added a settings for CMAS message broadcast"

parents af57b3df 39028572

core/java/android/provider/Settings.java

+6 −0
Original line number Diff line number Diff line
@@ -6904,6 +6904,12 @@ public final class Settings { 
         */

        public static final String PACKAGE_VERIFIER_STATE = "package_verifier_state";



        /**

         * Specifies additional package name for broadcasting the CMAS messages.

         * @hide

         */

        public static final String CMAS_ADDITIONAL_BROADCAST_PKG = "cmas_additional_broadcast_pkg";



        /**

         * This are the settings to be backed up.

         *

core/res/res/values/config.xml

+2 −2
Original line number Diff line number Diff line
@@ -2748,8 +2748,8 @@ 
    <!-- Flag indicates that whether non-system apps can be installed on internal storage. -->

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



    <!-- Component name of the default cell broadcast receiver -->

    <string name="config_defaultCellBroadcastReceiverComponent" translatable="false">com.android.cellbroadcastreceiver/.PrivilegedCellBroadcastReceiver</string>

    <!-- Package name of the default cell broadcast receiver -->

    <string name="config_defaultCellBroadcastReceiverPkg" translatable="false">com.android.cellbroadcastreceiver</string>



    <!-- Specifies the path that is used by AdaptiveIconDrawable class to crop launcher icons. -->

    <string name="config_icon_mask" translatable="false">"M50,0L100,0 100,100 0,100 0,0z"</string>

core/res/res/values/symbols.xml

+2 −2
Original line number Diff line number Diff line
@@ -2796,7 +2796,7 @@ 
  <java-symbol type="drawable" name="lockscreen_selected" />



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

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

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



  <java-symbol type="color" name="notification_primary_text_color_light" />

  <java-symbol type="color" name="notification_primary_text_color_dark" />

core/tests/coretests/src/android/provider/SettingsBackupTest.java

+1 −0
Original line number Diff line number Diff line
@@ -393,6 +393,7 @@ public class SettingsBackupTest { 
                 Settings.Secure.BACKUP_TRANSPORT,

                 Settings.Secure.BLUETOOTH_HCI_LOG,

                 Settings.Secure.CARRIER_APPS_HANDLED,

                 Settings.Secure.CMAS_ADDITIONAL_BROADCAST_PKG,

                 Settings.Secure.COMPLETED_CATEGORY_PREFIX,

                 Settings.Secure.CONNECTIVITY_RELEASE_PENDING_INTENT_DELAY_MS,

                 Settings.Secure.DEFAULT_INPUT_METHOD,