| 7f2a1e30dd5d14320ffc7b185ac25fdb79fe52b0 |
|
23-Jan-2018 |
Etan Cohen <etancohen@google.com> |
Update SmallTest library
android.test.suitebuilder.annotation.SmallTest is deprecated and
replaced by android.support.test.filters.SmallTest.
Update all test files. No other change (except import order cleaning
up to pass preload format check).
Bug: 72324160
Test: all unit tests pass
Change-Id: Icc4abe3b3b37926d583c0d4ae510a7d7c74c1a03
/frameworks/opt/net/wifi/tests/wifitests/src/com/android/server/wifi/WifiLockManagerTest.java
|
| edf05fb9dddfef041d21964f889028294e34f7a3 |
|
05-Jan-2018 |
Narayan Kamath <narayan@google.com> |
WifiLockManager: Fix event ordering for full Wifi locks.
Log the acquire before the release to avoid "holes" in the
collected data due to an acquire event immediately after a
release event in the case where the new and old workSource
have one or more attribution UIDs in common between them.
BatteryStats can correctly match "nested" acquire / release
pairs.
Test: WifiLockManagerTest
Bug: 62390666
Change-Id: I13f2f112be96e23cdcbf270b3b0fa4a0077b9ba4
/frameworks/opt/net/wifi/tests/wifitests/src/com/android/server/wifi/WifiLockManagerTest.java
|
| fd828776e37a5a8405a9ce0d4175d7971efbedcd |
|
02-Jan-2018 |
Narayan Kamath <narayan@google.com> |
WifiLockManager: Use WorkSource.isEmpty instead of WorkSource.size.
Required to support WorkSources that contain WorkChains (chained
attribution). This change also adds smoke tests to make sure that this
works end-to-end from the WifiLockManager's perspective.
Test: WifiLockManagerTest
Bug: 62390666
Change-Id: I4abb22c62bf9d21e4a661dcc4af2fb1b4aa0efd1
/frameworks/opt/net/wifi/tests/wifitests/src/com/android/server/wifi/WifiLockManagerTest.java
|
| 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/WifiLockManagerTest.java
|
| 9563500603c158373e2ee512c4d451783c104660 |
|
20-May-2016 |
Rebecca Silberstein <silberst@google.com> |
DO NOT MERGE WifiLockManager: create class to manage WifiLocks
( cherry-pick of Ib055078eb0a8555e9a7715d7ce10de1103e73130 from master)
Create new class to maintain WifiLocks requested by applications.
WifiLock management was closely tied to the WifiServiceImpl and made it
very difficult to write tests using different WifiLock modes in
DeviceIdle states. This CL moves the lock management to a new class,
WifiLockManager, and adds tests to check the behavior.
Bug: 28669096
Change-Id: Ib055078eb0a8555e9a7715d7ce10de1103e73130
Test: runtest frameworks-wifi
/frameworks/opt/net/wifi/tests/wifitests/src/com/android/server/wifi/WifiLockManagerTest.java
|