commit 9b6ee67985744117d6275bd85a649e15ea1ac5ac
author Nathan Harold <nharold@google.com> Thu Aug 02 22:16:07 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Aug 02 22:16:07 2018 +0000
tree bc4f98fb8782d3bcabbb16413dd02f7067212ae6
parent 34401800a11446bc147996ec75b12ca13863176f
parent 748b5756c00dab5081a9b10b6cf9d99686b13696

Merge "Throw on revoked location permission - telephony"

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 5d2eee7..dbfb317 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -1834,7 +1834,7 @@
         mPhone.getContext().getSystemService(AppOpsManager.class)
                 .checkPackage(Binder.getCallingUid(), callingPackage);
         if (!LocationAccessPolicy.canAccessCellLocation(mPhone.getContext(),
-                callingPackage, Binder.getCallingUid(),Binder.getCallingPid())) {
+                callingPackage, Binder.getCallingUid(), Binder.getCallingPid(), true)) {
             return null;
         }
 
@@ -1934,7 +1934,7 @@
         if (targetSdk > android.os.Build.VERSION_CODES.O_MR1 + 1) return null;
 
         if (!LocationAccessPolicy.canAccessCellLocation(mPhone.getContext(),
-                callingPackage, Binder.getCallingUid(), Binder.getCallingPid())) {
+                callingPackage, Binder.getCallingUid(), Binder.getCallingPid(), true)) {
             return null;
         }
 
@@ -1968,7 +1968,7 @@
         mPhone.getContext().getSystemService(AppOpsManager.class)
                 .checkPackage(Binder.getCallingUid(), callingPackage);
         if (!LocationAccessPolicy.canAccessCellLocation(mPhone.getContext(),
-                callingPackage, Binder.getCallingUid(), Binder.getCallingPid())) {
+                callingPackage, Binder.getCallingUid(), Binder.getCallingPid(), true)) {
             return null;
         }