Merge cherrypicks of [9231374, 9231389, 9231390, 9231391, 9231375, 9231286, 9231355, 9231376, 9231420, 9231462, 9231356, 9231421, 9231422, 9231402, 9231537, 9231557, 9231440, 9231441, 9231287, 9231288, 9231463, 9231464, 9231465, 9231423, 9231289, 9231392, 9230416, 9231466] into qt-c2f2-release

Change-Id: I9261a794cbf6ad0178dc121a14443c417ecfb7b2

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) {