diff options
| author | Rebecca Silberstein <silberst@google.com> | 2018-06-21 18:08:29 -0700 |
|---|---|---|
| committer | Michael Plass <mplass@google.com> | 2018-07-03 10:47:03 -0700 |
| commit | d5c6cd7fae3384f351b51f129d6820e84ca9ba16 (patch) | |
| tree | 3fb1f0a0c2fe449e67b152aeba97de5caa612d44 | |
| parent | 61f07635e61f2bf0c33788a262be47c0c090e3f8 (diff) | |
WifiServiceImpl: return new array on timeout
When attempting to retrieve scan results, the call could time out. In
this case, return a new (empty) array.
Bug: 74681710
Test: frameworks/opt/net/wifi/tests/wifitests/runtests.sh
Change-Id: I454f10431fd84ceacf6b329e4dc255219288b92c
| -rw-r--r-- | service/java/com/android/server/wifi/WifiServiceImpl.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/service/java/com/android/server/wifi/WifiServiceImpl.java b/service/java/com/android/server/wifi/WifiServiceImpl.java index c3bad8ae9..532aa3473 100644 --- a/service/java/com/android/server/wifi/WifiServiceImpl.java +++ b/service/java/com/android/server/wifi/WifiServiceImpl.java @@ -2056,6 +2056,7 @@ public class WifiServiceImpl extends IWifiManager.Stub { }, RUN_WITH_SCISSORS_TIMEOUT_MILLIS); if (!success) { Log.e(TAG, "Failed to post runnable to fetch scan results"); + return new ArrayList<ScanResult>(); } return scanResults; } catch (SecurityException e) { |