commit 0117f26357f585583d53fa9b933bbb8dcc2c8f50
author Philip P. Moltmann <moltmann@google.com> Fri Nov 01 19:45:59 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Nov 01 19:45:59 2019 +0000
tree 5f5948edc601a0ea4de01f53db417a1a555a490c
parent e1cf52864d92f6e0249dadc38777a37dccf29ba3
parent 827bba88eba65ac5855f495f812797bbf8fb92b9

Merge "No need to use PermissionChecker to check own permission"

src/com/android/cellbroadcastservice/CellBroadcastHandler.java

diff --git a/src/com/android/cellbroadcastservice/CellBroadcastHandler.java b/src/com/android/cellbroadcastservice/CellBroadcastHandler.java
index ffbef89..8eacb27 100644
--- a/src/com/android/cellbroadcastservice/CellBroadcastHandler.java
+++ b/src/com/android/cellbroadcastservice/CellBroadcastHandler.java
@@ -18,7 +18,6 @@
 
 import static android.Manifest.permission.ACCESS_COARSE_LOCATION;
 import static android.Manifest.permission.ACCESS_FINE_LOCATION;
-import static android.content.PermissionChecker.PERMISSION_GRANTED;
 import static android.provider.Settings.Secure.CMAS_ADDITIONAL_BROADCAST_PKG;
 
 import android.Manifest;
@@ -29,7 +28,7 @@
 import android.content.ContentValues;
 import android.content.Context;
 import android.content.Intent;
-import android.content.PermissionChecker;
+import android.content.pm.PackageManager;
 import android.location.Location;
 import android.location.LocationManager;
 import android.location.LocationRequest;
@@ -38,6 +37,7 @@
 import android.os.Handler;
 import android.os.HandlerExecutor;
 import android.os.Message;
+import android.os.Process;
 import android.os.UserHandle;
 import android.provider.Settings;
 import android.provider.Telephony;
@@ -377,8 +377,8 @@
         }
 
         private boolean hasPermission(String permission) {
-            return PermissionChecker.checkCallingOrSelfPermissionForDataDelivery(mContext,
-                    permission, null) == PERMISSION_GRANTED;
+            return mContext.checkPermission(permission, Process.myPid(), Process.myUid())
+                    == PackageManager.PERMISSION_GRANTED;
         }
     }
 }