summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2017-01-09 20:44:32 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2017-01-09 20:44:36 +0000
commitad873323fc0722df24c92e4619579e44b7eeda63 (patch)
treebc88e538c70189ff465a9bd13925150e753c4f10
parenta7fdfa81b75a23426ebd70c5a1548511b9168e29 (diff)
parent6356b6e3c78a5c78a48abeb22853cd9c1e3a3063 (diff)
Merge "Moved implicit intents into explicit intents" into nyc-mr1-dev-plus-aosp
-rw-r--r--core/res/res/values/config.xml3
-rw-r--r--core/res/res/values/symbols.xml2
2 files changed, 5 insertions, 0 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 2d3e11bfefce..e50d82c35ac0 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -2703,4 +2703,7 @@
<!-- 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>
</resources>
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index 63cd8798c876..09175d78ff35 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -2750,4 +2750,6 @@
<java-symbol type="bool" name="use_lock_pattern_drawable" />
<java-symbol type="drawable" name="lockscreen_notselected" />
<java-symbol type="drawable" name="lockscreen_selected" />
+
+ <java-symbol type="string" name="config_defaultCellBroadcastReceiverComponent" />
</resources>