Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '5d14d99e434af815ed7fff224d178d3d72c164eb' into manual_merge_5d14d99e434a

Browse Source 
Test: manual
Change-Id: I228ed62db45eeb5d384049b5b0fef57b0bcf9ac6
This commit is contained in:
Jack Yu
2017-01-09 14:33:12 -08:00
parent 99b73c61f2 5d14d99e43
commit 9f60453361
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/res/res/values/config.xml
View File

@@ -2675,4 +2675,7 @@
<!-- An array of packages for which notifications cannot be blocked. --> <!-- An array of packages for which notifications cannot be blocked. -->
<string-array translatable="false" name="config_nonBlockableNotificationPackages" /> <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> </resources>

1
core/res/res/values/symbols.xml
View File

@@ -2741,4 +2741,5 @@
<!-- Network Recommendation --> <!-- Network Recommendation -->
<java-symbol type="array" name="config_networkRecommendationPackageNames" /> <java-symbol type="array" name="config_networkRecommendationPackageNames" />
<java-symbol type="string" name="config_defaultCellBroadcastReceiverComponent" />
</resources> </resources>