summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXiangyu/Malcolm Chen <refuhoo@google.com>2017-06-16 01:48:18 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-06-16 01:48:18 +0000
commit652c4344c3de5d9b513e414e1d2848fedb13dfb5 (patch)
tree3e8ce733fb2eeb69193dd1e7da3824ba61855280
parent243a0aa77c2004f4e28f1388ee289eebf99e4f76 (diff)
parent074c0f2b0541bd3b613e9b345f4a3e58d0c744ad (diff)
downloadCellBroadcastReceiver-652c4344c3de5d9b513e414e1d2848fedb13dfb5.tar.gz
Merge "Make "Developer options" category in CellBroadcast not searchable." into oc-dr1-dev am: a87a105c06
am: 074c0f2b05 Change-Id: I64330c8900f81266d0bf10b2f6005ae4063e34d7
-rw-r--r--src/com/android/cellbroadcastreceiver/CellBroadcastSearchIndexableProvider.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastSearchIndexableProvider.java b/src/com/android/cellbroadcastreceiver/CellBroadcastSearchIndexableProvider.java
index b5dd8f2c3..5a17b2921 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastSearchIndexableProvider.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastSearchIndexableProvider.java
@@ -86,6 +86,11 @@ public class CellBroadcastSearchIndexableProvider extends SearchIndexablesProvid
Resources res = getContext().getResources();
Object[] ref;
+ ref = new Object[1];
+ ref[COLUMN_INDEX_NON_INDEXABLE_KEYS_KEY_VALUE] =
+ CellBroadcastSettings.KEY_CATEGORY_DEV_SETTINGS;
+ cursor.addRow(ref);
+
// Show alert settings and ETWS categories for ETWS builds and developer mode.
if (!enableDevSettings) {
// Remove general emergency alert preference items (not shown for CMAS builds).