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

Commit 9f604533 authored by Jack Yu's avatar Jack Yu
Browse files

Merge commit '5d14d99e' into manual_merge_5d14d99e434a 

Test: manual
Change-Id: I228ed62db45eeb5d384049b5b0fef57b0bcf9ac6
parents 99b73c61 5d14d99e

core/res/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -2675,4 +2675,7 @@ 


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

</resources>

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -2741,4 +2741,5 @@ 
<!-- Network Recommendation -->

  <java-symbol type="array" name="config_networkRecommendationPackageNames" />



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

</resources>