diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index dc8b5bf..add90ff 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;
         }
 
@@ -1932,7 +1932,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;
         }
 
@@ -1966,7 +1966,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;
         }
 
