diff options
author | The Android Automerger <android-build-merger@google.com> | 2017-01-27 06:39:05 +0000 |
---|---|---|
committer | The Android Automerger <android-build-merger@google.com> | 2017-01-27 06:39:05 +0000 |
commit | 53095bb5bdcb27c6c7a8fc155892a776d1759d5b (patch) | |
tree | 96378ce9973c37621ddc038612c93b76ad165718 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 798e1862bd67e7855eeb134d029e45b1aca8a081 (diff) | |
parent | a19056c35d16ddb5a6c1d3343729701b8939f1e1 (diff) |
Merge commit 'a19056c35d16ddb5a6c1d3343729701b8939f1e1' into nyc-mr1-dev-plus-aosp
* commit 'a19056c35d16ddb5a6c1d3343729701b8939f1e1': (35 commits)
NetworkMonitor: send one DNS probe per web probe
NetworkMonitor metrics: add first validation information
APF: also drop any ICMPv6 RSs
ConnectivityServiceTest: fix testAvoidBadWifiSettings
Fix ConnectivityServiceTest testRequestBenchmark
Switch over to new "time.android.com" NTP pool.
Define API for metering network stats buckets.
Refactored NetworkStatsServiceTest to use Mockito instead of EasyMock.
Use @Ignore to explicitly disable a @Test method.
Fixed NetworkStatsServiceTest and converted it to JUnit4.
VPN network stat accounting changes.
ConnectivityThread: use lazy holder idiom
ConnectivityManager: use ConnectivityThread looper
ConnectivityManager: a simpler CallbackHandler
Indicate the NsdServiceInfo attributes are only filled in for a resolved service.
Add a null check for the OnStartTetheringCallback.
TokenBucket for rate-limiting and throttling
IpConnectivityMetrics reads buffer size in settings
CaptivePortalLogin: set mixed content policy to compatibility.
Add IP conn metrics to dumpsys and bug reports
...
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions