commit 34c7167644be17ab67e96aead95a7c0d07c0dcec
author Chen Xu <fionaxu@google.com> Mon Oct 21 22:56:37 2019 -0700
committer Chen Xu <fionaxu@google.com> Thu Oct 24 00:33:22 2019 -0700
tree aa4d555d85ca5f8910e9e2797cf4576a614a5aa1
parent a3af8a5f502f1cdd546e7f7a065443a16756680a

cellbroadcast provider refactor

1. expose proper APIs to query framework cellbroadcast provider
2. export framework cellbroadcast provider
3. new URI with proper permission check

Bug: 135956699
Test: Build & Manual
Change-Id: I2f0ab939eb0e041900c112386117e90404b37452

src/com/android/cellbroadcastservice/GsmCellBroadcastHandler.java

diff --git a/src/com/android/cellbroadcastservice/GsmCellBroadcastHandler.java b/src/com/android/cellbroadcastservice/GsmCellBroadcastHandler.java
index abcbc20..051d963 100644
--- a/src/com/android/cellbroadcastservice/GsmCellBroadcastHandler.java
+++ b/src/com/android/cellbroadcastservice/GsmCellBroadcastHandler.java
@@ -110,7 +110,7 @@
 
         ContentResolver resolver = mContext.getContentResolver();
         for (CellBroadcastIdentity identity : geoFencingTriggerMessage.cbIdentifiers) {
-            try (Cursor cursor = resolver.query(CELL_BROADCAST_URI,
+            try (Cursor cursor = resolver.query(CellBroadcasts.CONTENT_URI,
                     CellBroadcasts.QUERY_COLUMNS_FWK,
                     where,
                     new String[] { Integer.toString(identity.messageIdentifier),
@@ -120,7 +120,7 @@
                 if (cursor != null) {
                     while (cursor.moveToNext()) {
                         cbMessages.add(SmsCbMessage.createFromCursor(cursor));
-                        cbMessageUris.add(ContentUris.withAppendedId(CELL_BROADCAST_URI,
+                        cbMessageUris.add(ContentUris.withAppendedId(CellBroadcasts.CONTENT_URI,
                                 cursor.getInt(cursor.getColumnIndex(CellBroadcasts._ID))));
                     }
                 }