History log of /frameworks/opt/net/wifi/tests/wifitests/src/com/android/server/wifi/scanner/WifiScanningServiceTest.java
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
23216ca333dc411e6ce0829f777ca29992388443 13-Jun-2017 Roshan Pius <rpius@google.com> WifiScanningService: Cache only results of full single scans

Change the single scan results caching logic inside WifiScanner:
1. Only cache scan results if they were for full scans. We've expanded
the meaning of "full scans" to include both 2g + 5g and 2g + 5g + dfs.
2. Filter out any scan results from the cache if they're over 3 minutes
old.

The motivation of this CL is to solve these problems:
1. Do not overwrite full scan results requested by an external app (ex.
Settings) with results from a partial scan
(ex. from WifiConnectivityManager).
This avoids the race condition where the settings app performs
a scan and gets a partial list of results back because it was ovewritten
by an internal partial scan request in between.
2. Scan results retrieved by apps will not contain stale scan
results. In N, wpa_supplicant evicted any scan results which were older
than 3 minutes from the cache. So, this CL restores that behavior.

Bug: 38212080
Test: Verified that both the settings and wifi wake is working properly
with the fix.
Test: Will send for full regression tests (b/62711875).
Test: New unit tests to verify that the partial scan results don't
override the cache.
Test: Modified existing unit tests to account for the change in
behavior. The broadcast (and cache) is now only updated on full scans.
Some of the tests were modified to produce full scan results, while the
other tests expectations were modified for partial scan results.

Change-Id: I4d6fb994d50995434f76218386272aa2562476fe
/frameworks/opt/net/wifi/tests/wifitests/src/com/android/server/wifi/scanner/WifiScanningServiceTest.java
ae5d7343534f7f41c53f98a1782183405ff32a0d 08-Jun-2017 Roshan Pius <rpius@google.com> Revert "WifiScanningService: Don't cache results of partial scan"

This reverts commit 24dc6bb288a15516c89ab507bb86511556824144.
BUG: 62394341

Change-Id: Ice9c5d34a374d5a600e0797504d3c4774e4b2ace
/frameworks/opt/net/wifi/tests/wifitests/src/com/android/server/wifi/scanner/WifiScanningServiceTest.java
24dc6bb288a15516c89ab507bb86511556824144 30-May-2017 Roshan Pius <rpius@google.com> WifiScanningService: Don't cache results of partial scan

These partial scan requests are initiated by the wifi stack when
connected to a network for network selection purposes. This might
interfere with full scan requests made by external apps. So, don't cache
such partial scan results. The apps will always get results of the last
full scan request made.

Bug: 38212080
Test: Unit tests
Test: Verified manually that the WifiManager#getScanResults() no longer
outputs partial scan results.

Change-Id: I5e320435e34c6bd74639dd13a480bb26ecea1edb
/frameworks/opt/net/wifi/tests/wifitests/src/com/android/server/wifi/scanner/WifiScanningServiceTest.java
46c84f9fd984cc4b67f5252e30bce7f756be558c 01-Mar-2017 Glen Kuhne <kuh@google.com> New Wifi Metrics Connection Event logging

Created a new StaEventList which logs all commands & messages from
Supplicant, Framework and the API that can modify the state of a STA
connection. Upto 512 of these are listed atomically and added to the
WifiMetrics report.

This enables metrics about the full lifetime of a Connection.

Bug: 35799311
Test: Added Unit tests
Change-Id: I11f75995f15203c9d38f78fe175de0fc4702e3b2
/frameworks/opt/net/wifi/tests/wifitests/src/com/android/server/wifi/scanner/WifiScanningServiceTest.java
bb9016d1e5f7c2b27502e7d7db13b55460bca88b 24-Mar-2017 Michael Plass <mplass@google.com> Cherry-picl: Remove bssid hotlist from framework

Bug: 30147676
Test: Relevant unit tests pass, wifi functions
Change-Id: Iac6a4c3d4a9e842e73b6122218fe0842126e43e7
/frameworks/opt/net/wifi/tests/wifitests/src/com/android/server/wifi/scanner/WifiScanningServiceTest.java
600cf5594ee20348f3642cbf77a4946dc52e9a6d 24-Mar-2017 Ningyuan Wang <nywang@google.com> Merge "Fix WifiScanningServiceTest" am: a5ad2d6d80 am: ef71a5876d
am: 2ebd8d56e9

Change-Id: I8f8fa32df134eddeb6ce160ecad7e73d065ac68d
fee1cae825bad9459edcefb67fa600874d875816 24-Mar-2017 Ningyuan Wang <nywang@google.com> Fix WifiScanningServiceTest

This fixes WifiScanningServiceTest by replacing any(Foo.class)
with any().
any() is able to match null.

Bug: 36407367
Test: compile, unit tests

Change-Id: I04adfea054086f38a9d8a03f800f9436d6ad1d78
/frameworks/opt/net/wifi/tests/wifitests/src/com/android/server/wifi/scanner/WifiScanningServiceTest.java
1356c05b7b5d5ca0e7f79340355e50cf8e5df39d 17-Mar-2017 Paul Duffin <paulduffin@google.com> Remove ambiguous wildcard import of org.mockito.Matchers.* am: 029cbaebb9 am: 7000e9738f
am: 0c95368083

Change-Id: Idb9a9c73d6f4f1a6c451a82da8f081fb0ff2f5f9
029cbaebb9ae0c1ef8596f56101e59984a71d64f 17-Mar-2017 Paul Duffin <paulduffin@google.com> Remove ambiguous wildcard import of org.mockito.Matchers.*

The recent upgrade to Mockito 2.7.13 has caused some problems
for grok (and new javac toolchain). The changed files used
wildcard imports to import the same methods from both Matchers
and Mockito.

This was not a problem previously because in the previous
version of Mockito the Mockito class extended the Matchers class
and so even though two methods with the same name were imported
they were not treated as a conflict because they were treated as
being the same method. In 2.7.13 the Mockito class no longer
extends the Matchers class instead they both extend the
ArgumentMatchers class and so for some reason javac no longer
treats them as the same method.

This was not detected by presubmit builds because jack is
still treating the methods as being the same.

Bug: 32912773
Test: m -j32 ANDROID_FORCE_JACK_ENABLED=disabled FrameworksWifiTests
Change-Id: I4f505b2b0450e14a65ff3a6ba2dc7b3583592047
/frameworks/opt/net/wifi/tests/wifitests/src/com/android/server/wifi/scanner/WifiScanningServiceTest.java
efe96b06536c59bf0e47d83c5544b228caf5111f 13-Mar-2017 Ningyuan Wang <nywang@google.com> Rename SupplicantWifiScannerImpl to WificondScannerImpl am: 05d51a2d8e am: e11ddc06aa
am: bea1f6ae58

Change-Id: Ic65d1cc964329c93e53b5a3f3bc39a8bc9f68b06
05d51a2d8eb67ea2eaf4cae43280d1cf9fe92645 02-Mar-2017 Ningyuan Wang <nywang@google.com> Rename SupplicantWifiScannerImpl to WificondScannerImpl

This also fixes a few formatting issues.

Bug: 35707137
Test: compile, unit tests, integration test

Change-Id: I1b6642b723c5676620d65136cc6c773b49e28559
/frameworks/opt/net/wifi/tests/wifitests/src/com/android/server/wifi/scanner/WifiScanningServiceTest.java
dbe0b20c52382bc600852fd73c75ba8685463045 11-Mar-2017 Paul Duffin <paulduffin@google.com> Merge "Refactor code incompatible with Mockito 2.7.13" am: 5a9f890485 am: 03ea367389
am: f0bad7a2a2

Change-Id: I01a07fd1b01797710bf630e16160a7a038c327a3
160c5fd3f82eeed7271d0efc44b6a409c9176326 09-Mar-2017 Paul Duffin <paulduffin@google.com> Refactor code incompatible with Mockito 2.7.13

Bug: 32912773
Test: make checkbuild
Change-Id: I78992a8c3bef98be2931d5aa5913c9c4033647cf
/frameworks/opt/net/wifi/tests/wifitests/src/com/android/server/wifi/scanner/WifiScanningServiceTest.java
d9e0e830e4b4f3c8397460cf5e197345df62c802 10-Jan-2017 Sohani Rao <sohanirao@google.com> Fix WifiScanningServiceImpl stand-alone unit test failure

WifiAsyncChannel and WifiHandler objects use lazy intialization for the
logging objects. WifiInjector.getInstance() may return a null object if
the unit test is run by itself or if earlier tests have not created it.

If the unit tests are able to update these instances with a logging
objects that are not null, then unit test can pass stand-alone.
- Add a method in FrameworkFacade to return new instances of
WifiAsyncChannel
- Update WifiAsyncChannel to expose setWifiLog() API for testing only
- Call this method on instances of WifiAsyncChannel returned by the mock
of FrameworkFacade factory to ensure mLog is not null
- Add a method in WifiScanningServiceImpl, also meant for testing only
to update WifiHandler with logging object
- Change unit tests to call this method after starting scanning service

Bug: 34127212
Test: WifiScanningServiceTest by itself and all unit tests pass
Change-Id: I0bc7a55d6d6862e2360bfb20897828e84358dd39
Merged-In: I0bc7a55d6d6862e2360bfb20897828e84358dd39
/frameworks/opt/net/wifi/tests/wifitests/src/com/android/server/wifi/scanner/WifiScanningServiceTest.java
e7ebc3fba71f4f996794bc5fa939674f8b4b2c5a 10-Jan-2017 Sohani Rao <sohanirao@google.com> Fix WifiScanningServiceImpl stand-alone unit test failure

WifiAsyncChannel and WifiHandler objects use lazy intialization for the
logging objects. WifiInjector.getInstance() may return a null object if
the unit test is run by itself or if earlier tests have not created it.

If the unit tests are able to update these instances with a logging
objects that are not null, then unit test can pass stand-alone.
- Add a method in FrameworkFacade to return new instances of
WifiAsyncChannel
- Update WifiAsyncChannel to expose setWifiLog() API for testing only
- Call this method on instances of WifiAsyncChannel returned by the mock
of FrameworkFacade factory to ensure mLog is not null
- Add a method in WifiScanningServiceImpl, also meant for testing only
to update WifiHandler with logging object
- Change unit tests to call this method after starting scanning service

Bug: 34127212
Test: WifiScanningServiceTest by itself and all unit tests pass
Change-Id: I0bc7a55d6d6862e2360bfb20897828e84358dd39
/frameworks/opt/net/wifi/tests/wifitests/src/com/android/server/wifi/scanner/WifiScanningServiceTest.java
710639ecf8ff2ab929c30121e7194c0a1b20d003 19-Dec-2016 Sohani Rao <sohanirao@google.com> Log API surfaces of WifiScanningService am: 4fbaf3821b am: 993626cd83 am: 688db32a92
am: 8e3ac94e9d

Change-Id: I7f6df4508e7be56abd00f2392b56f270809b3bb6
4fbaf3821bd5c3056c7c4cdd1aee3e17ac7046d0 29-Nov-2016 Sohani Rao <sohanirao@google.com> Log API surfaces of WifiScanningService

Add logging to trace the following API surfaces in WifiScanningService
- AIDL methods calls,
- Async Channel messages sent to the scanning service
- Use WifiHandler instead of Handler to define the client handler to
trace incoming messsages
- Async Channel messages sent by the service
- Use WifiAsyncChannel to trace reply messages sent by the service
- Fully connected Async Channel is used here, therefore, it can send
messages directly to the client's messenger without using Async
channel methods. Add logging in replySucceeded() and replyFailed()
to trace messages sent by the service directly to the client.

Bug: 33085782
Test: Unit test suite, verify logging, sanity test (power on and
connect to Wifi Access Point)

Change-Id: I8df4f4077801c359e11a93fde2c1ce5ea811a0e4
/frameworks/opt/net/wifi/tests/wifitests/src/com/android/server/wifi/scanner/WifiScanningServiceTest.java
c4ab3a215e66b9745bd8ad0b48372f090919cb7c 13-Dec-2016 Roshan Pius <rpius@google.com> Merge "WifiScanninService: Reject bgscan requests on invalid caps" am: cb5d15ae89 am: 22be8e6da9 am: cf13c9cb33
am: c8ec943671

Change-Id: I39d0c640877baae11c3fbdffb57374e93bc06fe4
1b76ca405029249b41b38424a253a8c5fa72dab1 13-Dec-2016 Roshan Pius <rpius@google.com> WifiScanninService: Reject bgscan requests on invalid caps

Reject any bgscan requests if the HAL returns invalid capabilities at
startup.

Bug: 33566846
Test: Added unit test.
Change-Id: I1a6a986194dd0da2ef139f13307657aafd67b4e4
/frameworks/opt/net/wifi/tests/wifitests/src/com/android/server/wifi/scanner/WifiScanningServiceTest.java
da94688198c864bb29be2e9603ebbe9ae6492a87 01-Nov-2016 Tamas Berghammer <tberghammer@google.com> Update package names to work with the proto3 compiler

Bug: b/28974522
Change-Id: I5f3adf4946ee4ba1e09e4f40afe83c151405972a
/frameworks/opt/net/wifi/tests/wifitests/src/com/android/server/wifi/scanner/WifiScanningServiceTest.java
a049f83a308e7753b68c1a5036ab67d9806807ec 15-Sep-2016 Rebecca Silberstein <silberst@google.com> WifiServiceImpl: move scan results dump to scanner

The dump command includes the most recent scan results. This
information should be dumped directly from WifiScanningServiceImpl
instead of WifiServiceImpl.

The output was also updated to better reflect the age of the entries.
Invalid scan result timestamps are output with "___?___". Values that
are older than the allotted characters are displayed as ">1000.0".
Valid ages were not changed. The character representing
isAutoJoinCandidate was removed from the output. SSID names that are
longer than 32 characters are truncated.

BUG: 31523862
Test: manual check of bugreport output
Test: manual check of adb shell dumpsys wifi output
Test: manual check of adb shell dumpsys wifiscanner output
Test: frameworks/opt/net/wifi/tests/wifitests/runtests.sh
Change-Id: I6529fa7b125a6d7d283fd7dc5f8938632ae4e93f
/frameworks/opt/net/wifi/tests/wifitests/src/com/android/server/wifi/scanner/WifiScanningServiceTest.java
c9c91fd93350151a33d87fca768921520c256256 20-Sep-2016 Mitchell Wills <mwills@google.com> Ignore disconnect messages that don't indicate the channel is dead

Bug: 29368784
Test: mmma frameworks/opt/net/wifi/tests && runtest frameworks-wifi
Change-Id: I5ae3665898565379b101c4ac0c5570c9debb1228
(cherry picked from commit d76a14997a969ea44daa47756dcc8f83aee96935)
(also includes cherry picked from commit ca0add40bb7138b361c8a86e42aa5facc4fa5f2d)
/frameworks/opt/net/wifi/tests/wifitests/src/com/android/server/wifi/scanner/WifiScanningServiceTest.java
d94a62ffdf0e7f282948109d05d96e682eb32eef 15-Sep-2016 Rebecca Silberstein <silberst@google.com> WifiService: get scan results from WifiScanner

Retrieve scan results in WifiServiceImpl from WifiScanner instead of
WifiStateMachine. This utilizes a new method and message type in
WifiScanner. Tests are added to verify the scan results are returned,
updated and cleared properly. This CL additionally fixes a few typos
in tests.

Removal of cached scan results from WifiStateMachine will be included in
a separate CL.

BUG: 31444878
Test: manually tested from settings UI
Test: frameworks/opt/net/wifi/tests/wifitests/runtests.sh
Test: ran GTS CtsNetTestCases
Change-Id: I02c4e24030d2801eb195a84177d908574de0596e
/frameworks/opt/net/wifi/tests/wifitests/src/com/android/server/wifi/scanner/WifiScanningServiceTest.java
6259b630ddb59b642729a2d2113d81ed8e33a0e3 12-Sep-2016 Roshan Pius <rpius@google.com> WifiScanningService: Change hidden/PNO scan params

Since networks are no longer configured in wpa_supplicant, network
IDs/priorities being passed around for hidden/PNO scanning does not make
any sense. Changing the wifi scanner interface to remove all
network ID/priority references.

For hidden networks, we'll now send a sorted array of <ssid> for
each network (similar to PNO). This should help wificond prioritize
networks when the size exceed the max supported by driver.
Also, since wpa_supplicant already supports sending a list of ssids for
scanning, plumb it all the way through.

NOTE:
1. The backend for all these scans will eventually be replaced by
wificond.
2. Hidden networks are no longer considered in bgscan requests. This was
anyway not workin in HalWifiScanner's gscan backed bgscan.

BUG: 29503772
TEST: Existing unit tests.
TEST: Successfully connected to a hidden network on device
Change-Id: Ie7783353d2eb87c2fd7b9a10f44e3e5df4cbc218
/frameworks/opt/net/wifi/tests/wifitests/src/com/android/server/wifi/scanner/WifiScanningServiceTest.java
6c11cd5d6ff04afdf1bbbc99a850025d46c7bdc9 12-Sep-2016 Rebecca Silberstein <silberst@google.com> WifiScanningService: Move scan results bcast

A WifiManager.SCAN_RESULTS_AVIALABLE_ACTION broadcast is sent when scan results
are returned for an app/user initiated scan. This broadcast is now
located in the WifiScanningService instead of WifiStateMachine. Further
cleanup will move retrieval of the scan results from WifiStateMachine to
WifiScanningService. Tests were added to WifiScanningServiceTest to
verify the broadcast is sent in both scanning success and failure cases.

BUG: 31347837
TEST: frameworks/opt/net/wifi/tests/wifitests/runtests.sh on angler
Change-Id: I7c11d571552090057593539b0ed736bc2cedeb00
/frameworks/opt/net/wifi/tests/wifitests/src/com/android/server/wifi/scanner/WifiScanningServiceTest.java
3219e97566a093ed10b2a9d6fe77ed9089084d63 07-Sep-2016 Mitchell Wills <mwills@google.com> Add a flag to indicate if a ScanData is for a scan for all channels

BUG=30897947

Change-Id: I989a25dd3df3f473090b76b4e3cb798a2d513490
(cherry picked from commit 4e1f32efceee1db37bfb1e2624b434dbfb055686)
/frameworks/opt/net/wifi/tests/wifitests/src/com/android/server/wifi/scanner/WifiScanningServiceTest.java
635e01902944c3367ccca28611a5b0b718f98bfd 21-Jul-2016 Roshan Pius <rpius@google.com> WifiScanningServiceImpl: Add ClientInfo null checks am: 5382acb5eb
am: 0df9502510

Change-Id: Ibd4c01c4a32935d2a1d72ef179dbca9d8b3ff2c7
5382acb5eb3a0448a32651dcc7fe9fd634ce0e38 20-Jul-2016 Roshan Pius <rpius@google.com> WifiScanningServiceImpl: Add ClientInfo null checks

Add missing null checks for |ClientInfo| in a few places. ClientInfo
could end up being null if there was a pending cleanup of the client
before processing of the request in the appropriate state machine.

Also, add a unit test to simulate the scenario in the bug specified.

BUG: 30241457
Change-Id: Ic4412ae03b5176764b10cba357d19086c0c09e6e
TEST: Unit tests
/frameworks/opt/net/wifi/tests/wifitests/src/com/android/server/wifi/scanner/WifiScanningServiceTest.java
251a38bb7fcac510ad8b0264a0346573e724519d 27-Jun-2016 Mitchell Wills <mwills@google.com> Merge \\"Add a WifiScanner API to listen for ongoing scans\\" into nyc-mr1-dev am: 450fee26a2
am: f12262368a

Change-Id: I159d7a82a9cf965b90284174c635090ee8704c26
1ba04405f98489f0fbd66b6566c64324be11111a 23-Jun-2016 Mitchell Wills <mwills@google.com> Add a WifiScanner API to listen for ongoing scans

Bug: 29412469
Change-Id: I1b8c6f3524e937cbc902af0be391b5e6b23e8ee2
/frameworks/opt/net/wifi/tests/wifitests/src/com/android/server/wifi/scanner/WifiScanningServiceTest.java
4dcf7a8d2b9253e5a58328a9cd954c524c76c7af 25-Jun-2016 Mitchell Wills <mwills@google.com> Merge \\"Reuse single scan results if a request comes in during an ongoing scan\\" into nyc-mr1-dev am: 55b1b58e72
am: b5dcbf476f

Change-Id: I341a4d5523ef20e0e44558ee12d448fd7324e0e4
5751e82f645ab5b4366c63e0fbc561534c1cb3b8 22-Jun-2016 Mitchell Wills <mwills@google.com> Reuse single scan results if a request comes in during an ongoing scan

Change-Id: I590c64a4718385214e4ba803112ed7283f69b3be
Fixes: 28936380
/frameworks/opt/net/wifi/tests/wifitests/src/com/android/server/wifi/scanner/WifiScanningServiceTest.java
a2f9a80b25772edfa6a8b4cb679202fc8e9154cd 16-Jun-2016 Mitchell Wills <mwills@google.com> Merge \\"Better distinguish between WifiScanner clients in logs\\" into nyc-mr1-dev am: b271c249de
am: 8b35350228

Change-Id: I8f827d683a15c285194b7e4a773368dd02e9d85e
9e7f5e0a47a9a4aa519a50d9a0959547c1c604f1 15-Jun-2016 Mitchell Wills <mwills@google.com> Better distinguish between WifiScanner clients in logs

Change-Id: I15327935f4b9ccdf3d3244087c508f19fd275c1f
Fixes: 29385784
/frameworks/opt/net/wifi/tests/wifitests/src/com/android/server/wifi/scanner/WifiScanningServiceTest.java
622e9ff3874251022ae3c27548bc5a2f77bdc8bc 13-Jun-2016 Glen Kuhne <kuh@google.com> Merge "DO NOT MERGE WifiMetrics: Record capture duration" into nyc-dev
7684d94aa98d82c82e060ff48326181669184f35 11-Jun-2016 Mitchell Wills <mwills@google.com> Fix crash when cleaning up WifiScanner client before Wifi enabled am: 3040b86393 am: 82f4aada1c
am: cecab03d5d

Change-Id: I1378659fc87d0b419a8f96e4fec779e4251db158
3040b86393a04bc939a5a94cda4169b0293dfac7 10-Jun-2016 Mitchell Wills <mwills@google.com> Fix crash when cleaning up WifiScanner client before Wifi enabled

Change-Id: Ia212840fcf781740d5e185d3e3c2e30a477e25f0
Fixes: 29250616
/frameworks/opt/net/wifi/tests/wifitests/src/com/android/server/wifi/scanner/WifiScanningServiceTest.java
49410c13ba2284fb7c836fd3527dc526ea5681a0 07-Jun-2016 Glen Kuhne <kuh@google.com> DO NOT MERGE WifiMetrics: Record capture duration

Adds a wifi metric that records the capture duration period represented
by the WifiLog proto. This is to improve the way wifiLogs are weighted when
aggregated.
Modified WifiMetrics to use the Clock wrapper of SystemClock to
facilitate unit tests.

BUG=29185886

Change-Id: I61dd2b481c26f0ea21bcb280ce1d40f3d73b7625
/frameworks/opt/net/wifi/tests/wifitests/src/com/android/server/wifi/scanner/WifiScanningServiceTest.java
107f6ce4a5f6017ce336d9b60650ddbe28bee965 07-Jun-2016 Glen Kuhne <kuh@google.com> WifiMetrics: Record capture duration

Adds a wifi metric that records the capture duration period represented
by the WifiLog proto. This is to improve the way wifiLogs are weighted when
aggregated.
Modified WifiMetrics to use the Clock wrapper of SystemClock to
facilitate unit tests.

BUG=29185886

Change-Id: I61dd2b481c26f0ea21bcb280ce1d40f3d73b7625
/frameworks/opt/net/wifi/tests/wifitests/src/com/android/server/wifi/scanner/WifiScanningServiceTest.java
4c683072aec815aa7762750c55bd65fa40fb6bb2 27-May-2016 Mitchell Wills <mwills@google.com> Fix WifiScanner tests after parameter adjustment am: e733ddab52 am: f44e8186c8
am: 7b960e4c68

* commit '7b960e4c682b8ea2faf5a4611d30f3d97eacda32':
Fix WifiScanner tests after parameter adjustment

Change-Id: Ic848f977201fc233c42002d1cf346b74aca57e21
e733ddab5260b153ad76ed73a672de928d0f4b37 26-May-2016 Mitchell Wills <mwills@google.com> Fix WifiScanner tests after parameter adjustment

Change-Id: Ia18913aed38ff5fa7655878340b99e15132a32d1
Fixes: 28970259
/frameworks/opt/net/wifi/tests/wifitests/src/com/android/server/wifi/scanner/WifiScanningServiceTest.java
c08e5f08975e6a504b6f8e5b04d66e0a0c18416b 23-May-2016 Mitchell Wills <mwills@google.com> Merge "Make sure that all ways a scan can fail get logged" into nyc-dev am: 1f9f7c109c am: 7a56e2720d
am: 96a9d6f315

* commit '96a9d6f31570331a127aa1f5cf271f899bcf638a':
Make sure that all ways a scan can fail get logged

Change-Id: I6cdd08add801a472359cab21a77f31b03e9486be
1f9f7c109ca952884fb7bff7271669d879ce9b97 23-May-2016 Mitchell Wills <mwills@google.com> Merge "Make sure that all ways a scan can fail get logged" into nyc-dev
256ee9e914f0e7470a4a0f804d2d5ce7f1a9697d 21-May-2016 Roshan Pius <rpius@google.com> resolve merge conflicts of cbb193c to master

Change-Id: I8ba39ea770cef1f5163452fd322631356de80d15
9d6a7a1b5f9e9ea194fc6b15044c9d14d6aefabf 21-May-2016 Roshan Pius <rpius@google.com> Merge changes Ie64c11f3,I91272aa5 into nyc-dev

* changes:
WifiNetworHistory: Don't persist QNS blacklist
Change clock for time interval/elapsed measurments
56820e92fd4b1a0cee83f552905fc76fc8290146 20-May-2016 Mitchell Wills <mwills@google.com> Make sure that all ways a scan can fail get logged

Bug: 28682351
Change-Id: If9296d862adbd479e8600699f06f4684d377ae6a
/frameworks/opt/net/wifi/tests/wifitests/src/com/android/server/wifi/scanner/WifiScanningServiceTest.java
79ceb468ea245b8a9303ece0ee5946d5e4d7a45b 20-May-2016 Mitchell Wills <mwills@google.com> Merge "Add tests to verify single scan blame behavior" into nyc-dev am: 61d025c1d7 am: cd14b5dfbc
am: 9077ef4db7

* commit '9077ef4db7b832d98a6a73f84b3ffddb3b4a8e09':
Add tests to verify single scan blame behavior

Change-Id: I9a30b85c9792ef8bd8197c799100862095bf921a
61d025c1d760de811fd62e3b2d376b47d61d10a1 20-May-2016 Mitchell Wills <mwills@google.com> Merge "Add tests to verify single scan blame behavior" into nyc-dev
ee0ab818341d44614ffe56ae73ecc08b974c2cbb 20-May-2016 Roshan Pius <rpius@google.com> Change clock for time interval/elapsed measurments

1. Use the clock retrieved from WifiInjector in more modules: QNS,
Scanner, WifiConfigManager.
2. Use |elapsedRealtime| for time interval/elapsed measurments. Things
like scan results, config elements still continue to use
|currentTimeMillis|

Also,
1. Had to make |tryEnableQualifiedNetwork| public to prevent mockito from
calling the real method in WifiConfigManager.
2. Move keystore also into WifiInjector.

BUG: 28299258
BUG: 28824635
Change-Id: I91272aa5665abb741da7530d8920d09c8c5ea41f
TEST: Compiles & unit-test passes
/frameworks/opt/net/wifi/tests/wifitests/src/com/android/server/wifi/scanner/WifiScanningServiceTest.java
f4267b6840dbc7f430638c35c5448187b6e83846 19-May-2016 Christopher Wiley <wiley@google.com> Move test components into its own static library

This allows us to share the class with networking code
in frameworks/base/services. Moved:
- MockLooper
- BidirectionalAsyncChannel*
- MockAlarmManager
- MockAnswerUtil

Bug: 28848133
Test: These tests continue to pass

Change-Id: I97bba188da1eb07aa8f6fccf6f051c48b197d5f1
/frameworks/opt/net/wifi/tests/wifitests/src/com/android/server/wifi/scanner/WifiScanningServiceTest.java
1345d63ec537cc75b8daf9cafbb8b1fd78338ec5 18-May-2016 Mitchell Wills <mwills@google.com> Add tests to verify single scan blame behavior

Bug: 28320003
Change-Id: I4cfdedb1d5c3c29608208bb1c3bda42f4759fb7f
/frameworks/opt/net/wifi/tests/wifitests/src/com/android/server/wifi/scanner/WifiScanningServiceTest.java
f5cdd8e7a6b7d4c0b5f77134273c7e894d8c087b 16-May-2016 Mitchell Wills <mwills@google.com> Fix crash when scanner gets results that don't match the request

Before this, when WifiScanningService processed single scan results from
supplicant that only contained results that did not match a request the
filter code would return null indicating that the results should not be
delivered, causing a NPE later. This change updates the meaning of the
bucket index that the single scan code provides to the filtering code to
instead force it to always include scan results.

Change-Id: I65cd57b14abacec3f407991188c570601d05ac77
Fixes: 28794598
/frameworks/opt/net/wifi/tests/wifitests/src/com/android/server/wifi/scanner/WifiScanningServiceTest.java
59298c7cfffdf856e32879ec967fe27c7e977a49 04-May-2016 Mitchell Wills <mwills@google.com> Add more details about what scan results were delivered to clients

Fixes: 28563549
Change-Id: I445054af4b176c69a26af6fe340a6eb88cf06452
/frameworks/opt/net/wifi/tests/wifitests/src/com/android/server/wifi/scanner/WifiScanningServiceTest.java
d36b93b07ee7a3f6116cc7ae7a1a1e6b687a9d3c 25-Apr-2016 Mitchell Wills <mwills@google.com> Fix another potential crash when dumping WifiScanningService

Also make logging in WifiScanningService not static and add some tests
to verify some logging behavior.

Fixes: 28274869
Change-Id: I879200778dcadb4e67d5a85d42442baf3ceef6c9
/frameworks/opt/net/wifi/tests/wifitests/src/com/android/server/wifi/scanner/WifiScanningServiceTest.java
a8367288377cbaed6371256ca837b7aa22280706 11-Apr-2016 Mitchell Wills <mwills@google.com> Move WifiScanner related code to scanner package

Change-Id: I73d01fe4d0de99a4e9758353cacf1d7a790cf040
/frameworks/opt/net/wifi/tests/wifitests/src/com/android/server/wifi/scanner/WifiScanningServiceTest.java