commit 134d6e8f3c7b5c5e5cbd9ec151afa59f9e0a0f35
author Chen Xu <fionaxu@google.com> Mon Dec 09 22:47:39 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Dec 09 22:47:39 2019 +0000
tree 0a1f0ecf6dfd37fb3dab6379faec795b00d7b408
parent a40dfd20a24b1f1f32bbc2143dab0fa7187dba0e
parent 1b2c9f9d670e9d086bac8bf6784a6b8bc2e3737d

Merge "use public constructor for SmsCbLocation"

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4dc0b97..e075727 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -48,6 +48,7 @@
                 android:authorities="cellbroadcasts"
                 android:exported="true"
                 android:singleUser="true"
+                android:readPermission="android.permission.READ_CELL_BROADCASTS"
                 android:multiprocess="false" />
     </application>
 </manifest>

src/com/android/cellbroadcastservice/CellBroadcastProvider.java

diff --git a/src/com/android/cellbroadcastservice/CellBroadcastProvider.java b/src/com/android/cellbroadcastservice/CellBroadcastProvider.java
index 1369b52..34fbf66 100644
--- a/src/com/android/cellbroadcastservice/CellBroadcastProvider.java
+++ b/src/com/android/cellbroadcastservice/CellBroadcastProvider.java
@@ -16,7 +16,6 @@
 
 package com.android.cellbroadcastservice;
 
-import android.app.AppOpsManager;
 import android.content.ContentProvider;
 import android.content.ContentUris;
 import android.content.ContentValues;
@@ -153,7 +152,6 @@
     public boolean onCreate() {
         mDbHelper = new CellBroadcastDatabaseHelper(getContext());
         mPermissionChecker = new CellBroadcastPermissionChecker();
-        setAppOps(AppOpsManager.OP_READ_CELL_BROADCASTS, AppOpsManager.OP_NONE);
         return true;
     }
 

tests/AndroidManifest.xml

diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index 7403d26..fd60e45 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -17,6 +17,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.cellbroadcastservice.tests">
 
+    <uses-permission android:name="android.permission.READ_CELL_BROADCASTS" />
+
     <application>
         <uses-library android:name="android.test.runner" />
     </application>