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

Added a settings for CMAS message broadcast

Browse Source 
This is for sl4a automation to receive CMAS messages
broadcasdt. The automation should inject the settings
through 'adb settings'.

Test: manual
bug: 34393649
Change-Id: Ic29be11b641f185219146d7fbb05561f5907ea76
This commit is contained in:
Jack Yu
2017-02-23 09:49:25 -08:00
parent f780d86963
commit 3902857290
4 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6887,6 +6887,12 @@ public final class Settings {
*/
public static final String PACKAGE_VERIFIER_STATE = "package_verifier_state";
/**
* 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.
*

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

@@ -2740,8 +2740,8 @@
<!-- Flag indicates that whether non-system apps can be installed on internal storage. -->
<bool name="config_allow3rdPartyAppOnInternal">true</bool>
<!-- 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>
<!-- Specifies the path that is used by AdaptiveIconDrawable class to crop launcher icons. -->
<string name="config_icon_mask" translatable="false">"M50,0L100,0 100,100 0,100 0,0z"</string>

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

@@ -2800,7 +2800,7 @@
<java-symbol type="drawable" name="lockscreen_selected" />
<java-symbol type="string" name="notification_header_divider_symbol_with_spaces" />
<java-symbol type="string" name="config_defaultCellBroadcastReceiverComponent" />
<java-symbol type="string" name="config_defaultCellBroadcastReceiverPkg" />
<java-symbol type="color" name="notification_primary_text_color_light" />
<java-symbol type="color" name="notification_primary_text_color_dark" />
@@ -2851,7 +2851,7 @@
<!-- android.service.trust -->
<java-symbol type="bool" name="config_allowEscrowTokenForTrustAgent"/>
<!-- Time picker -->
<java-symbol type="id" name="toggle_mode"/>
<java-symbol type="id" name="input_mode"/>

1
core/tests/coretests/src/android/provider/SettingsBackupTest.java
View File

@@ -391,6 +391,7 @@ public class SettingsBackupTest {
Settings.Secure.BACKUP_TRANSPORT,
Settings.Secure.BLUETOOTH_HCI_LOG,
Settings.Secure.CARRIER_APPS_HANDLED,
Settings.Secure.CMAS_ADDITIONAL_BROADCAST_PKG,
Settings.Secure.COMPLETED_CATEGORY_PREFIX,
Settings.Secure.CONNECTIVITY_RELEASE_PENDING_INTENT_DELAY_MS,
Settings.Secure.DEFAULT_INPUT_METHOD,