commit b458ff0908907cb61f8e72f79f98914498760a08
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jan 09 00:21:24 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jan 09 00:21:24 2020 +0000
tree c94d2824ce8e28a59e0ea7f7d58108f394b520ed
parent c154dffc84b462bb0edbd18247bde4b4e63017b1
parent 83a53679caebd3ff4c9fae102957c09eef8f8755

Merge changes from topics "141018421_set3", "146905502" am: 79cb7e4361 am: 83a53679ca

Change-Id: I7b9d97a214487d75a786bcd145a6df10b966e2ba

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 5f7b627..ab83e1c 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -6087,8 +6087,8 @@
             // Scrub out the location info in ServiceState depending on what level of access
             // the caller has.
             if (hasFinePermission) return ss;
-            if (hasCoarsePermission) return ss.sanitizeLocationInfo(false);
-            return ss.sanitizeLocationInfo(true);
+            if (hasCoarsePermission) return ss.createLocationInfoSanitizedCopy(false);
+            return ss.createLocationInfoSanitizedCopy(true);
         } finally {
             Binder.restoreCallingIdentity(identity);
         }