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

Commit 82c46d11 authored by Jack Yu's avatar Jack Yu
Browse files

resolve merge conflicts of e091985b to stage-aosp-master 

Test: Manual
Change-Id: Icaf4663abd3ad233afa3e31ff1939dbb7c07a2a5
parents f4854018 e091985b

core/java/android/provider/Settings.java

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

        public static final String DEVICE_PAIRED = "device_paired";



        /**

         * 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
@@ -2729,6 +2729,6 @@ 
    <!-- An array of packages for which notifications cannot be blocked. -->

    <string-array translatable="false" name="config_nonBlockableNotificationPackages" />



    <!-- 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>

</resources>

core/res/res/values/symbols.xml

+1 −1
Original line number Diff line number Diff line
@@ -2763,5 +2763,5 @@ 
  <java-symbol type="drawable" name="lockscreen_notselected" />

  <java-symbol type="drawable" name="lockscreen_selected" />



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

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

</resources>