commit d3eeb40f052a34d3c5c26d44fa6cfb02c04727c8
author Jordan Liu <jminjie@google.com> Fri Nov 15 11:13:59 2019 -0800
committer Jack Yu <jackyu@google.com> Tue Dec 03 11:33:30 2019 -0800
tree 5624bc2e3f03ab383883eba9471c3aa5dc8c9b5e
parent e9fd9c3ae2b053f1ed5f3aeb74bbfc930079d8c3

Redefine query columns in provider

Bug: 135956699
Test: manual and atest CellBroadcastServiceTests

Merged-In: I5d3d99d4c85086c246490abc00a82d267a43cf1e
Change-Id: I5d3d99d4c85086c246490abc00a82d267a43cf1e
(cherry picked from commit b51f693e7bbcb6fb6487be1b2170d3275ad7d0a0)

src/com/android/cellbroadcastservice/CellBroadcastHandler.java

diff --git a/src/com/android/cellbroadcastservice/CellBroadcastHandler.java b/src/com/android/cellbroadcastservice/CellBroadcastHandler.java
index cc0aba4..8966417 100644
--- a/src/com/android/cellbroadcastservice/CellBroadcastHandler.java
+++ b/src/com/android/cellbroadcastservice/CellBroadcastHandler.java
@@ -322,10 +322,7 @@
         List<SmsCbMessage> cbMessages = new ArrayList<>();
 
         try (Cursor cursor = mContext.getContentResolver().query(CellBroadcasts.CONTENT_URI,
-                // TODO: QUERY_COLUMNS_FWK is a hidden API, since we are going to move
-                //  CellBroadcastProvider to this module we can define those COLUMNS in side
-                //  CellBroadcastProvider and reference from there.
-                CellBroadcasts.QUERY_COLUMNS_FWK,
+                CellBroadcastProvider.QUERY_COLUMNS,
                 where,
                 new String[] {Long.toString(dupCheckTime)},
                 null)) {