diff options
| author | 2017-02-23 09:49:25 -0800 | |
|---|---|---|
| committer | 2017-02-24 04:36:26 +0000 | |
| commit | d1d64730b9e6e213b138ab155708ee668f67851c (patch) | |
| tree | 2468b76c61359970472ba51d1cc1aeb9786d078e | |
| parent | b4234e6af84501f5c23090a3205122b44effea12 (diff) | |
Added a settings for CMAS message broadcast
This is for sl4a automation to receive CMAS messages
broadcasdt. The automation should inject the settings
through 'adb settings'.
Test: manual
bug: 34393649
Merged-In: Ic29be11b641f185219146d7fbb05561f5907ea76
Change-Id: Ic29be11b641f185219146d7fbb05561f5907ea76
| -rwxr-xr-x | core/java/android/provider/Settings.java | 6 | ||||
| -rw-r--r-- | core/res/res/values/config.xml | 4 | ||||
| -rw-r--r-- | core/res/res/values/symbols.xml | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index b1dcb812f531..55b853dfce24 100755 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -6416,6 +6416,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. * * NOTE: Settings are backed up and restored in the order they appear diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 4ff78ead9e5f..09bf39c2cd9f 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -2683,6 +2683,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> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 66087d697048..dbeda0b14879 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -2741,5 +2741,5 @@ <!-- Network Recommendation --> <java-symbol type="array" name="config_networkRecommendationPackageNames" /> - <java-symbol type="string" name="config_defaultCellBroadcastReceiverComponent" /> + <java-symbol type="string" name="config_defaultCellBroadcastReceiverPkg" /> </resources> |