Removing privileged context requirement for civic location (server)
Bug: 139170192
Test: All unit tests pass. End-to-end tests pass.
Change-Id: Ifa757b6f8937c9399396614255851f644d4df716
(cherry picked from commit 80102fffcd9d43b1238d5c6f5406e9429f1e869c)
diff --git a/service/java/com/android/server/wifi/rtt/RttServiceImpl.java b/service/java/com/android/server/wifi/rtt/RttServiceImpl.java
index 19ae154..d69ce8f 100644
--- a/service/java/com/android/server/wifi/rtt/RttServiceImpl.java
+++ b/service/java/com/android/server/wifi/rtt/RttServiceImpl.java
@@ -1178,16 +1178,11 @@
"ResponderLocation: lci/lcr parser failed exception -- " + e);
}
// Clear LCI and LCR data if the location data should not be retransmitted,
- // has a retention expiration time, contains no useful data, or did not parse.
- if (responderLocation == null) {
+ // has a retention expiration time, contains no useful data, or did not parse,
+ // or the caller is not in a privileged context.
+ if (responderLocation == null || !isCalledFromPrivilegedContext) {
lci = null;
lcr = null;
- } else if (!isCalledFromPrivilegedContext) {
- // clear the raw lci and lcr buffers and civic location data if the
- // caller is not in a privileged context.
- lci = null;
- lcr = null;
- responderLocation.setCivicLocationSubelementDefaults();
}
if (resultForRequest.successNumber <= 1
&& resultForRequest.distanceSdInMm != 0) {
