commit e5111b20413dbd7b09f466b7dd01b6c12f518fd6
author Chen Xu <fionaxu@google.com> Fri Dec 20 21:38:22 2019 -0800
committer Chen Xu <fionaxu@google.com> Fri Dec 20 23:25:03 2019 -0800
tree 078f7c54efdfbeeda6c0e4a56339f413a1b6909f
parent 320c97bac06554d0c0a64ef517f9218738d108ea

officially build CBS against system_current

Bug: 135956699
Test: Build
Change-Id: Ife8de67154d7f8ce55f8936cb7eb824d91e526db

Android.bp

diff --git a/Android.bp b/Android.bp
index 514ebc8..baeff91 100644
--- a/Android.bp
+++ b/Android.bp
@@ -8,10 +8,9 @@
       ":framework-cellbroadcast-shared-srcs",
     ],
     libs: [
-        "telephony-common",
         "unsupportedappusage",
     ],
-    platform_apis: true,
+    sdk_version: "system_current",
     certificate: "platform",
     privileged: true,
     resource_dirs: ["res"],

src/com/android/cellbroadcastservice/CdmaServiceCategoryProgramHandler.java

diff --git a/src/com/android/cellbroadcastservice/CdmaServiceCategoryProgramHandler.java b/src/com/android/cellbroadcastservice/CdmaServiceCategoryProgramHandler.java
index 032edcc..6cdb531 100644
--- a/src/com/android/cellbroadcastservice/CdmaServiceCategoryProgramHandler.java
+++ b/src/com/android/cellbroadcastservice/CdmaServiceCategoryProgramHandler.java
@@ -143,7 +143,7 @@
         for (String pkg : pkgs) {
             intent.setPackage(pkg);
             mContext.sendOrderedBroadcast(intent, Manifest.permission.RECEIVE_SMS,
-                    AppOpsManager.OP_RECEIVE_SMS, mScpResultsReceiver,
+                    AppOpsManager.OPSTR_RECEIVE_SMS, mScpResultsReceiver,
                     getHandler(), Activity.RESULT_OK, null, null);
             mScpCallback.add(callback);
         }