From c4713c9006b236bf1c7d0bf82b50bfb6b1eb53b6 Mon Sep 17 00:00:00 2001
From: David Su <dysu@google.com>
Date: Wed, 8 Jul 2020 12:57:54 -0700
Subject: ScanRequestProxy: Return copy of list in getScanResults

Return a copy of internal list to prevent external
modification.

Bug: 160751554
Test: atest FrameworksWifiTests
Change-Id: Id7f8c05160d0d480077327d56dec03080708b375
Merged-In: Id7f8c05160d0d480077327d56dec03080708b375
(cherry picked from commit 48e1bcfb68371999d968c4527791d302be3140b4)
---
 service/java/com/android/server/wifi/ScanRequestProxy.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'service')

diff --git a/service/java/com/android/server/wifi/ScanRequestProxy.java b/service/java/com/android/server/wifi/ScanRequestProxy.java
index c054b90a4..622fcdab9 100644
--- a/service/java/com/android/server/wifi/ScanRequestProxy.java
+++ b/service/java/com/android/server/wifi/ScanRequestProxy.java
@@ -464,7 +464,8 @@ public class ScanRequestProxy {
      * @return the list of results
      */
     public List<ScanResult> getScanResults() {
-        return mLastScanResults;
+        // return a copy to prevent external modification
+        return new ArrayList<>(mLastScanResults);
     }
 
     /**
-- 
cgit v1.2.3