diff options
| -rw-r--r-- | service/java/com/android/server/wifi/rtt/RttServiceImpl.java | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/service/java/com/android/server/wifi/rtt/RttServiceImpl.java b/service/java/com/android/server/wifi/rtt/RttServiceImpl.java index 19ae1540e..d69ce8f00 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 @@ public class RttServiceImpl extends IWifiRttManager.Stub { "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) { |