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

resolve merge conflicts of e091985bb5 to stage-aosp-master

Browse Source 
am: 82c46d11f6

Change-Id: I2b6b5f698d03c86957fdaf4f73e26dfe36758924
This commit is contained in:
Jack Yu
2017-02-25 04:58:12 +00:00
committed by android-build-merger
parent 9897cc4369 82c46d11f6
commit 9080d6708d
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

@@ -6427,6 +6427,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.
*

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

@@ -2729,6 +2729,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>

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

@@ -2763,5 +2763,5 @@
<java-symbol type="drawable" name="lockscreen_notselected" />
<java-symbol type="drawable" name="lockscreen_selected" />
<java-symbol type="string" name="config_defaultCellBroadcastReceiverComponent" />
<java-symbol type="string" name="config_defaultCellBroadcastReceiverPkg" />
</resources>