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

Merge "Added a settings for CMAS message broadcast"

Browse Source
This commit is contained in:
Treehugger Robot
2017-02-25 01:13:28 +00:00
committed by Gerrit Code Review
parent fcb37ffc60 d1d64730b9
commit e091985bb5
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/provider/Settings.java
View File

@@ -6415,6 +6415,12 @@ public final class Settings {
*/ */
public static final String DEVICE_PAIRED = "device_paired"; 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. * This are the settings to be backed up.
* *

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

@@ -2683,6 +2683,6 @@
<!-- 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 --> <!-- Package name of the default cell broadcast receiver -->
<string name="config_defaultCellBroadcastReceiverComponent" translatable="false">com.android.cellbroadcastreceiver/.PrivilegedCellBroadcastReceiver</string> <string name="config_defaultCellBroadcastReceiverPkg" translatable="false">com.android.cellbroadcastreceiver</string>
</resources> </resources>

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

@@ -2741,5 +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" /> <java-symbol type="string" name="config_defaultCellBroadcastReceiverPkg" />
</resources> </resources>