OSDN Git Service
Hugo Benichi [Fri, 9 Dec 2016 09:29:11 +0000 (09:29 +0000)]
DO NOT MERGE: ConnectivityServiceTest: fix testAvoidBadWifiSettings
am:
53d83d5142 -s ours
Change-Id: I07650e028dbe5be6d04761ae0cbb9e9512d31d53
Hugo Benichi [Fri, 9 Dec 2016 09:28:32 +0000 (09:28 +0000)]
DO NOT MERGE: Fix ConnectivityServiceTest testRequestBenchmark
am:
cbf8ff83a8 -s ours
Change-Id: I6af5dd9e2bf31346578d5fca4a635ba3af2f2099
Jeff Sharkey [Fri, 9 Dec 2016 09:27:54 +0000 (09:27 +0000)]
DO NOT MERGE: Switch over to new "time.android.com" NTP pool.
am:
dda938a698 -s ours
Change-Id: I2b1825f00459952d6f3430c99661aafc907e6c37
Stephen Chen [Fri, 9 Dec 2016 09:27:11 +0000 (09:27 +0000)]
DO NOT MERGE: Define API for metering network stats buckets.
am:
dadf6caf9f -s ours
Change-Id: I3dcf9d32deeb09d08364b135714b84e685767dee
Felipe Leme [Fri, 9 Dec 2016 09:26:31 +0000 (09:26 +0000)]
DO NOT MERGE: Refactored NetworkStatsServiceTest to use Mockito instead of EasyMock.
am:
e4c029918f -s ours
Change-Id: Ieeea6db94be1d402fe8129f02bea2586346dcf76
Felipe Leme [Fri, 9 Dec 2016 09:25:12 +0000 (09:25 +0000)]
DO NOT MERGE: Use @Ignore to explicitly disable a @Test method.
am:
2026ca147b -s ours
Change-Id: I17818101fa8f47d285cf772a0f67373c1dda5e30
Felipe Leme [Fri, 9 Dec 2016 09:24:24 +0000 (09:24 +0000)]
DO NOT MERGE: Fixed NetworkStatsServiceTest and converted it to JUnit4.
am:
77cba4bdf6 -s ours
Change-Id: I907010456f9bb9674748222fd5e82b8b64dce46f
Jeremy Joslin [Fri, 9 Dec 2016 09:23:37 +0000 (09:23 +0000)]
DO NOT MERGE: VPN network stat accounting changes.
am:
ffe5a46b3e -s ours
Change-Id: Ic42723be04158feafd268b3859f0e938d3e36d01
Hugo Benichi [Fri, 9 Dec 2016 09:22:57 +0000 (09:22 +0000)]
DO NOT MERGE: ConnectivityThread: use lazy holder idiom
am:
ce765b7a51 -s ours
Change-Id: I0625013f14e4a2c24a238677a3de50961d114619
Hugo Benichi [Fri, 9 Dec 2016 09:22:16 +0000 (09:22 +0000)]
DO NOT MERGE: ConnectivityManager: use ConnectivityThread looper
am:
1853f78d76 -s ours
Change-Id: Ia41bae1435c94e042358e8b88b42f83cd5359a6e
Hugo Benichi [Fri, 9 Dec 2016 09:21:22 +0000 (09:21 +0000)]
DO NOT MERGE: ConnectivityManager: a simpler CallbackHandler
am:
4983e55853 -s ours
Change-Id: I806d5d79994785357390707d77760af3af725477
Philip P. Moltmann [Fri, 9 Dec 2016 09:20:02 +0000 (09:20 +0000)]
DO NOT MERGE: Indicate the NsdServiceInfo attributes are only filled in for a resolved service.
am:
29154b000f -s ours
Change-Id: I5c7c11dc4f8112f0ca89b482c2ba10a6a94abfba
Jeremy Klein [Fri, 9 Dec 2016 09:19:21 +0000 (09:19 +0000)]
DO NOT MERGE: Add a null check for the OnStartTetheringCallback.
am:
c8e4cc8e99 -s ours
Change-Id: I3290e0f17c8d29f7e7216687f85b7487a3b85ac5
Hugo Benichi [Tue, 15 Nov 2016 04:42:34 +0000 (13:42 +0900)]
DO NOT MERGE: ConnectivityServiceTest: fix testAvoidBadWifiSettings
This patch introduces an assertEventuallyThat helper function in
ConnectivityServiceTest which given a boolean function retries until the
function returns true or until a maximum retry time is reached.
This function is used to fix flakyness of testAvoidBadWifiSetting where
the Message posted by reevaluate() could reach the Handler's
MessageQueue after waitForIdle takes effect, resulting in the test to
fail.
Instead of fixing the flakyness by introdcing hard sleep times,
assertEventuallyThat is used to reduce the overall test time.
With this change the test has been observed to pass with 100% success
rate over 50000 invocations.
Test: $ runtest frameworks-net
Bug:
32561414
(cherry picked from commit
99c8294ef0c7a720364abb5884063e0a9d1bb5fe)
Change-Id: If41a24989d5f65aeb439f68741f511b5eb53b18d
Hugo Benichi [Tue, 15 Nov 2016 02:25:52 +0000 (11:25 +0900)]
DO NOT MERGE: Fix ConnectivityServiceTest testRequestBenchmark
This patch fixes flakyness of testRequestBenchmark by adjusting time
limit for callback registration from 100ms to 180ms, and time limits for
onAvailable and onLost triggers from 30ms to 40ms.
With these timeouts the test succeeds 100% over 5000 iterations.
When using 150ms for registration timeout, running the test 5000 times
fails 2 times.
When using 30ms for onLost timeout, running the test 5000 times fails
1 times.
In addition, this patch also cleans testRequestBenchmark and uses the
more stable SystemClock.elapsedRealtime() for duration measurements.
Test: $ runtest frameworks-net
Bug:
32561414
(cherry picked from commit
38be57b438a0c1754091f045317db2049304e16f)
Change-Id: I196ab9ef7f5abe456a783eed65db09279d2ecb8c
Jeff Sharkey [Fri, 2 Dec 2016 19:17:21 +0000 (12:17 -0700)]
DO NOT MERGE: Switch over to new "time.android.com" NTP pool.
Also add logging to measure success/failure details.
Test: builds, boots, and NTP fix obtained
Bug:
32969463
(cherry picked from commit
d3f689bf14a05de735b5cc92dcf20e7226c78690)
Change-Id: I7da416099ae903fd92beb516251ef4e51673eecf
Stephen Chen [Tue, 18 Oct 2016 23:41:47 +0000 (16:41 -0700)]
DO NOT MERGE: Define API for metering network stats buckets.
This is a continuation of b/
26545374, since now we can also set the
metered bit with NetworkScorer. The tracking of metered state changes
will be implemented in a seperate CL.
Bug:
31015360
Bug:
26545374
Test: N/A
(cherry picked from commit
9ac251d1169639c7b955d63b21e80cbc5c394090)
Change-Id: I6a2fcc8577d62daa8823dff9e0128a5cf39ede7b
Felipe Leme [Thu, 18 Aug 2016 23:20:01 +0000 (16:20 -0700)]
DO NOT MERGE: Refactored NetworkStatsServiceTest to use Mockito instead of EasyMock.
Test: m -j32 FrameworksServicesTests && adb install -r -g ${ANDROID_PRODUCT_OUT}/data/app/FrameworksServicesTests/FrameworksServicesTests.apk && adb shell am instrument -e class "com.android.server.net.NetworkStatsServiceTest" -w "com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner"
BUG:
30943463
(cherry picked from commit
b8f946dc4b24998f14e28573e452ab13ed533347)
Change-Id: Ia9929295ab2396a7ebb133e65d157f98414e4dfa
Felipe Leme [Mon, 22 Aug 2016 15:50:43 +0000 (08:50 -0700)]
DO NOT MERGE: Use @Ignore to explicitly disable a @Test method.
BUG:
30839080
BUG:
31007021
(cherry picked from commit
fc7d7a359f800d7320d29055ef3b4b75157aaf13)
Change-Id: I35942e60493adebb22871541a34240368c691ee7
Felipe Leme [Thu, 18 Aug 2016 22:31:45 +0000 (15:31 -0700)]
DO NOT MERGE: Fixed NetworkStatsServiceTest and converted it to JUnit4.
Most tests were failing because due to a null NetworkCapabilities.
Example:
1) testNetworkStatsWifi(com.android.server.net.NetworkStatsServiceTest)
java.lang.NullPointerException: Attempt to invoke virtual method 'boolean android.net.NetworkCapabilities.hasCapability(int)' on a null object reference
at
com.android.server.net.NetworkStatsService.updateIfacesLocked(NetworkStatsService.java:983)
BUG:
30839080
(cherry picked from commit
574f370c6da52eeffe747248d68ef044617c7bcf)
Change-Id: Ie09b2f43cf6ec745e404d5ec98bd0b072d211ea3
Jeremy Joslin [Mon, 8 Aug 2016 23:07:37 +0000 (16:07 -0700)]
DO NOT MERGE: VPN network stat accounting changes.
Properly account for VPN apps that make heavy use of the tun
interface. Prior to this change a VPN app could be incorrectly charged
for more data than it actually used if it sent more traffic through
the tun interface than the underlying interface.
This change excludes VPN app traffic on the tun interface from the
adjustment pool and doesn't redistribute traffic to the VPN app.
Instead all of the redistributed traffic is deducted from the VPN app
which effectively represents any overhead incurred by the VPN app.
BUG:
30557871
(cherry picked from commit
8b436d865c9f287e9ae491e5278cd8874f4a865b)
Change-Id: I06f01aa8fe5fdc06b2d36cfb9c68feb244c2e5de
Hugo Benichi [Thu, 13 Oct 2016 07:48:42 +0000 (16:48 +0900)]
DO NOT MERGE: ConnectivityThread: use lazy holder idiom
This patch changes the way that the ConnectivityThread is lazily
instantiated by using the "lazy initialization holder class idiom".
The first code point that tries to obtain a reference to the unique
ConnectivityThread instance will trigger the creation of the Singleton
class, which will guarantee a thread-safe initialization of the static
INSTANCE field inside Singleton according to the language specs.
This is the Item #71 of Effective Java.
The unique static instance of ConnectivityThread is not stored directly
inside ConnectivityThread class but is stored in a static nested class.
This is to avoid triggering the creation of that unique instance when
Zygote does class preloading at phone startup. Otherwise this would lead
to Zygote creating a new OS thread during preloading, which is a fatal
error.
Test: frameworks-wifi tests pass
Bug:
26749700
Bug:
28537383
Bug:
32130437
(cherry picked from commit
c4fe5d373caa9f53686e4d58e61394dd40558957)
Change-Id: If13b363889a8e9396273a90c3d9f9421a48aecbc
Hugo Benichi [Thu, 7 Jul 2016 01:15:56 +0000 (10:15 +0900)]
DO NOT MERGE: ConnectivityManager: use ConnectivityThread looper
This patch removes the static singleton looper used by
ConnectivityManager and instead uses the common ConnectivityThread.
This allows to removes the static atomic counter used to track
the number of registered NetworkCallback in ConnectivityManager, because
the looper is not turned off anymore when no callbacks are registered.
Also an overloaded version of sendRequestForNetwork is added taking as a
new parameter a Handler. This will allow to overload various callback
and request related API calls with user provided Handlers.
Test: ConnectivityServiceTest passes
Bug:
26749700
Bug:
28537383
Bug:
32130437
(cherry picked from commit
7724cdd8b90006c852644d06cf6c8a28450c71c6)
Change-Id: If956addbf8e7b11b36a4b966de7fca00e8f362c1
Hugo Benichi [Wed, 6 Jul 2016 13:53:17 +0000 (22:53 +0900)]
DO NOT MERGE: ConnectivityManager: a simpler CallbackHandler
This patch simplifies CallbackHandler in the following way:
- CallbackHandler directly uses the static references to
sNetworkCallback and sCallbackRefCount. This allows to remove
instance fields in CallbackHandler.
- CallbackHandler does not have a reference to ConnectivityManager
anymore
- CallbackHandler.getObject() is now generic in a type-safe way.
Test: ConnectivityServiceTest passes
Bug:
28537383
Bug:
32130437
(cherry picked from commit
d42650faaa33ec6274278c65a6042228555ddd4f)
Change-Id: I1b5fe2a361b5f623a8310ae698497c83d72f3034
Philip P. Moltmann [Mon, 18 Apr 2016 23:23:06 +0000 (16:23 -0700)]
DO NOT MERGE: Indicate the NsdServiceInfo attributes are only filled in for a resolved service.
Fixes:
28530428
(cherry picked from commit
7d5da4b044183826ac8388c8bdb94ac979a81797)
Change-Id: If2bfc06589adb361f11b89cd5923cb5c255cb680
Jeremy Klein [Sun, 13 Mar 2016 00:29:54 +0000 (16:29 -0800)]
DO NOT MERGE: Add a null check for the OnStartTetheringCallback.
This avoids a NullPointerException when trying to call the callback
and gives a more readable error message.
(cherry picked from commit
5f277e1667b49976a77c9fa79b9a04d775f3b49e)
Change-Id: Ia419ff68ef10f308f9e44be47420e27099ee6070
Hugo Benichi [Fri, 9 Dec 2016 03:31:44 +0000 (03:31 +0000)]
Merge changes from topic 'framework-net-aosp'
am:
25afce88a6
Change-Id: I04262e6b654c8ce0fd44139d5568783d75ccbe7b
Hugo Benichi [Fri, 9 Dec 2016 03:31:37 +0000 (03:31 +0000)]
DO NOT MERGE: IpConnectivityMetrics: rate limit ApfProgramEvents
am:
f99a33a1b4 -s ours
Change-Id: Iedfe60899226b6007963b0852f87ecebb5bc987e
Hugo Benichi [Fri, 9 Dec 2016 03:30:56 +0000 (03:30 +0000)]
DO NOT MERGE: TokenBucket for rate-limiting and throttling
am:
05ad47add8 -s ours
Change-Id: I7f5a7a47d7e430fc503612bfd0a844b5ffe1bde9
Hugo Benichi [Fri, 9 Dec 2016 03:29:58 +0000 (03:29 +0000)]
DO NOT MERGE: IpConnectivityMetrics reads buffer size in settings
am:
8c9e4b68f0 -s ours
Change-Id: Ie3265557cacf2014ace63fcd73f1334330558631
Lorenzo Colitti [Fri, 9 Dec 2016 03:28:51 +0000 (03:28 +0000)]
DO NOT MERGE: CaptivePortalLogin: set mixed content policy to compatibility.
am:
b55bf38351 -s ours
Change-Id: Ia5ca5f84367fd92848aa03446617bb296d4c93b3
Hugo Benichi [Fri, 9 Dec 2016 03:28:06 +0000 (03:28 +0000)]
DO NOT MERGE: Add IP conn metrics to dumpsys and bug reports
am:
5635c270a1 -s ours
Change-Id: Ia9b6e6887fd80211ff054584127ec9141a22fd57
Hugo Benichi [Fri, 9 Dec 2016 03:27:23 +0000 (03:27 +0000)]
DO NOT MERGE: IpConnectivity metrics: add version number
am:
9df2ae138b -s ours
Change-Id: If27714f6dc3475030da891cd25a0f8e174ea83e3
Treehugger Robot [Fri, 9 Dec 2016 03:19:13 +0000 (03:19 +0000)]
Merge changes from topic 'framework-net-aosp'
* changes:
DO NOT MERGE: IpConnectivityMetrics: rate limit ApfProgramEvents
DO NOT MERGE: TokenBucket for rate-limiting and throttling
DO NOT MERGE: IpConnectivityMetrics reads buffer size in settings
DO NOT MERGE: CaptivePortalLogin: set mixed content policy to compatibility.
DO NOT MERGE: Add IP conn metrics to dumpsys and bug reports
DO NOT MERGE: IpConnectivity metrics: add version number
Hugo Benichi [Tue, 18 Oct 2016 01:36:33 +0000 (10:36 +0900)]
DO NOT MERGE: IpConnectivityMetrics: rate limit ApfProgramEvents
This patch uses the previously introduced TokenBucket to rate limit
ApfProgramEvents, still allowing for burst of ApfProgramEvents when a
new interface is set up (due to ipv4 provisioning, multicast lock, ipv6 RAs
triggering new APF program events in short amounts of time).
Test: new test in IpConnectivityMetricsTest
Bug:
1550402
(cherry picked from commit
e1c173d2240a8eedf7685c9371087dc047a6931f)
Change-Id: Idb640dec13ba64180985544b9709a586af66eb6e
Hugo Benichi [Mon, 17 Oct 2016 23:43:30 +0000 (08:43 +0900)]
DO NOT MERGE: TokenBucket for rate-limiting and throttling
This patch adds a TokenBucket class that can accumulate and distribute
tokens over time.
Test: comes with unit tests.
Bug:
32198637
(cherry picked from commit
998493f0ee39ae0e9ffdea27f48f1b11b0807fcb)
Change-Id: I4012ae6d02f7004bceee9a2ba03914f2a2506031
Hugo Benichi [Wed, 19 Oct 2016 02:17:28 +0000 (11:17 +0900)]
DO NOT MERGE: IpConnectivityMetrics reads buffer size in settings
Test: IpConnectivityMetricsTest passes. Also manually changed the new
setting and verified the buffer size is as expected after flushing the
buffer.
Bug:
32198637
(cherry picked from commit
05686dbb6b965eb1a54591d2ed2334337886c6ee)
Change-Id: Iefbeac3a688b260fb3f92dfe0bfd9db28e26749d
Lorenzo Colitti [Fri, 21 Oct 2016 09:41:25 +0000 (18:41 +0900)]
DO NOT MERGE: CaptivePortalLogin: set mixed content policy to compatibility.
This makes the policy for mixed HTTP/HTTPS content match Chrome.
This allows us to display login pages where unimportant
subresources are HTTP.
Bug:
32171569
(cherry picked from commit
625166377b2d7c5f09d1e7617b3eac3a464fba53)
Change-Id: Ia82958192d978280715442e182c34f9da5c88c66
Hugo Benichi [Wed, 19 Oct 2016 04:48:40 +0000 (13:48 +0900)]
DO NOT MERGE: Add IP conn metrics to dumpsys and bug reports
Test: manually created a bug report and inspected content.
(cherry picked from commit
51d14cb60793a9a073b8a29ff7875bb518cd7d54)
Change-Id: I9649cc2f9bb7a1975e60baaae55fcdb2a48c3b93
Hugo Benichi [Thu, 13 Oct 2016 04:16:16 +0000 (13:16 +0900)]
DO NOT MERGE: IpConnectivity metrics: add version number
This patch adds a version field to ipconnectivity.proto and populates it
to 2, which is the logical version number for NYC-MR2.
Test: IpConnectivity{EventBuilder,Metrics}Test pass
Bug:
32127906
(cherry picked from commit
d680d4c856f54bea0c60dea74ba4204822391e49)
Change-Id: If8f167c0dc4c1abe0e235e2adfd131168a4ddc52
Yoshinori Hirano [Thu, 8 Dec 2016 21:05:16 +0000 (21:05 +0000)]
Merge "Don't include front most excluded task in Multi-Window mode"
am:
a8c2c229d7
Change-Id: If5c1a8de2cc951d8ec97b40c57cbbc8313137a37
Treehugger Robot [Thu, 8 Dec 2016 20:52:14 +0000 (20:52 +0000)]
Merge "Don't include front most excluded task in Multi-Window mode"
Lorenzo Colitti [Thu, 8 Dec 2016 10:15:03 +0000 (10:15 +0000)]
Merge changes from topic 'framework-net-aosp'
am:
b92aa5bdfd
Change-Id: I9f4cb99312b61e47bfb80f35a5c2478bc1be2473
Etan Cohen [Thu, 8 Dec 2016 10:14:55 +0000 (10:14 +0000)]
DO NOT MERGE: [CS] Remove timeout event after first available
am:
bf3b1bad15 -s ours
Change-Id: I24ccd42ff2078ffac5560a132dcd2432118f6788
Hugo Benichi [Thu, 8 Dec 2016 10:14:16 +0000 (10:14 +0000)]
DO NOT MERGE: ApfTest: tag tests with @SmallTest or @MediumTest
am:
5d2654124e -s ours
Change-Id: I8cfbe35c719dc2f135ec695f346c555fb45dfa58
Lorenzo Colitti [Thu, 8 Dec 2016 10:13:37 +0000 (10:13 +0000)]
DO NOT MERGE: Unbreak TetherInterfaceStateMachineTest.
am:
5bce5a16b1 -s ours
Change-Id: I820b911f737e8b00ff3069505a2412ba9fdf3e1c
Lorenzo Colitti [Thu, 8 Dec 2016 10:12:57 +0000 (10:12 +0000)]
DO NOT MERGE: Move the connectivity tests to frameworks/base/tests/net.
am:
7ceef950a0 -s ours
Change-Id: I866c317dbec720a5ec6c64b1e7e14437d132ce7e
Lorenzo Colitti [Thu, 8 Dec 2016 10:11:44 +0000 (10:11 +0000)]
DO NOT MERGE: De-guava BroadcastInterceptingContext and move it to testutils.
am:
3c295b59f5 -s ours
Change-Id: I72123940742a0ca1418f8c892da82b6bb984f4ae
Lorenzo Colitti [Thu, 8 Dec 2016 10:11:01 +0000 (10:11 +0000)]
DO NOT MERGE: Move FakeSettingsProvider to a common location.
am:
b8df76e413 -s ours
Change-Id: I017a302961d252a3fe4e062a0642b79d64230f54
Hugo Benichi [Thu, 8 Dec 2016 10:10:22 +0000 (10:10 +0000)]
DO NOT MERGE: ConnectivityServiceTest: mark flaky test as such
am:
5d540d1410 -s ours
Change-Id: I2bd4e64b397fe2bd6ec8a11b02753c26df1a2000
Calvin On [Thu, 8 Dec 2016 10:09:43 +0000 (10:09 +0000)]
DO NOT MERGE: Add option to skip and avoid captive portals.
am:
1f64f3fd14 -s ours
Change-Id: I549bc49715a6476069f30aa206d8b4d1310fe6c5
Hugo Benichi [Thu, 8 Dec 2016 10:09:05 +0000 (10:09 +0000)]
DO NOT MERGE: ApfFilter: use elapsedRealTime for RA lifetime
am:
dafc44ea11 -s ours
Change-Id: Ic80e642dffa4f1246e91aeaa5bdedf450f703ccd
Hugo Benichi [Thu, 8 Dec 2016 10:08:15 +0000 (10:08 +0000)]
DO NOT MERGE: Do not synchronize boolean reads/writes
am:
94dcb3c3fd -s ours
Change-Id: If30f221e24c897be9e2fddf66a9d6c9db2b5a431
Hugo Benichi [Thu, 8 Dec 2016 10:07:12 +0000 (10:07 +0000)]
DO NOT MERGE: ApfFilter: systematically use u8, u16, u32 getters
am:
4104ff9220 -s ours
Change-Id: I699a4d4403e21c3ebb59e29c7732dba78eb006d7
Hugo Benichi [Thu, 8 Dec 2016 10:06:34 +0000 (10:06 +0000)]
DO NOT MERGE: Add fuzzing tests to ApfFilter RA processing
am:
0668a61d82 -s ours
Change-Id: I961d0fd200c1317e1e81657071acf1fe7ae43f6f
Erik Kline [Thu, 8 Dec 2016 10:05:58 +0000 (10:05 +0000)]
DO NOT MERGE: Support timeouts for requestNetwork() invocations.
am:
3841a48d0a -s ours
Change-Id: Ia0431810a2a2081116bc5c31b4c6a37ab09a69ad
Pierre Imai [Thu, 8 Dec 2016 10:05:18 +0000 (10:05 +0000)]
DO NOT MERGE: Silence the obnoxious MTU 0 error message that occur when no MTU is specified for a given network.
am:
accd5fcb79 -s ours
Change-Id: Ib54fcd8b268872bc599e2b4dedaa7bbb4d7f8956
Lorenzo Colitti [Thu, 8 Dec 2016 09:56:18 +0000 (09:56 +0000)]
Merge changes from topic 'framework-net-aosp'
* changes:
DO NOT MERGE: [CS] Remove timeout event after first available
DO NOT MERGE: ApfTest: tag tests with @SmallTest or @MediumTest
DO NOT MERGE: Unbreak TetherInterfaceStateMachineTest.
DO NOT MERGE: Move the connectivity tests to frameworks/base/tests/net.
DO NOT MERGE: De-guava BroadcastInterceptingContext and move it to testutils.
DO NOT MERGE: Move FakeSettingsProvider to a common location.
DO NOT MERGE: ConnectivityServiceTest: mark flaky test as such
DO NOT MERGE: Add option to skip and avoid captive portals.
DO NOT MERGE: ApfFilter: use elapsedRealTime for RA lifetime
DO NOT MERGE: Do not synchronize boolean reads/writes
DO NOT MERGE: ApfFilter: systematically use u8, u16, u32 getters
DO NOT MERGE: Add fuzzing tests to ApfFilter RA processing
DO NOT MERGE: Support timeouts for requestNetwork() invocations.
DO NOT MERGE: Silence the obnoxious MTU 0 error message that occur when no MTU is specified for a given network.
Etan Cohen [Thu, 27 Oct 2016 22:05:50 +0000 (15:05 -0700)]
DO NOT MERGE: [CS] Remove timeout event after first available
Guarantees that timeouts are only delivered if a network never
becomes available. Once a network is available the timeout is
canceled.
Bug:
31402633
Test: all timeout related unit tests pass (new one added)
(cherry picked from commit
681fcda5896fd6c94f8a543ef9983c0a0644e87e)
Change-Id: I7cd3086544c881915fc6dbf14b87a24ab0cd8748
Hugo Benichi [Wed, 2 Nov 2016 04:43:22 +0000 (13:43 +0900)]
DO NOT MERGE: ApfTest: tag tests with @SmallTest or @MediumTest
Test methods not tagged with @{Small,Medium,Large}Test will not appear
in the Android Platform Continuous Testing dashboard.
Test methods tagged with @LargeTest will not be run in the Android
Platform Continuous Testing dashboard.
Test: ApfTest passes ($runtest frameworks-net)
Bug:
31479480
(cherry picked from commit
4195c28347cc100954f83c3c92b4dde4673f8608)
Change-Id: Ia215fc8e2ccc61f6223c24fdf390e1e759de302f
Lorenzo Colitti [Fri, 28 Oct 2016 08:45:55 +0000 (17:45 +0900)]
DO NOT MERGE: Unbreak TetherInterfaceStateMachineTest.
This was broken by the implementation of IPv6 tethering, which
relies on various private classes which end up calling unmockable
final classes like NetworkInterface.
Making everything public like this is almost certainly not the
best way of fixing this test, but on the other hand there is
value to the test continuing to pass.
Test: runtest frameworks-net # Everything passes.
Test: IPv6 tethering continues to work.
(cherry picked from commit
7e0eeca8ba4063d0d35dda9a8dfcc612e45efb87)
Change-Id: I8a3cf466871c026f4ae0f5cfa73071338cdf5b7e
Lorenzo Colitti [Fri, 28 Oct 2016 03:48:36 +0000 (12:48 +0900)]
DO NOT MERGE: Move the connectivity tests to frameworks/base/tests/net.
This will give us a good place to put all the networking tests.
Fix:
31479480
Test: adb shell am instrument -w -e notClass com.android.server.connectivity.tethering.TetherInterfaceStateMachineTest 'com.android.frameworks.tests.net/android.support.test.runner.AndroidJUnitRunner' # PASS
(cherry picked from commit
ecc986d430f4b8158f177ed97d2edb741f11ff71)
Change-Id: I993eeaa5dec001c39389023f355f506129b356e7
Lorenzo Colitti [Fri, 28 Oct 2016 03:56:03 +0000 (12:56 +0900)]
DO NOT MERGE: De-guava BroadcastInterceptingContext and move it to testutils.
Removing the static dependency on guava reduces test compile time
by about 20 seconds on a Z840, thus substantially speeding up the
compile/test cycle.
Make FutureIntent public instead of package-private because it is
used directly by NetworkPolicyManagementServiceTest, which as of
this CL is now in a different package.
(cherry picked from commit
281a17c9580de5c9898be7d9654d428801976511)
Test: runtest frameworks-services -c com.android.server.ConnectivityServiceTest # PASS
Test: runtest frameworks-services -c com.android.server.NetworkPolicyManagerServiceTest # PASS
Test: runtest frameworks-services -c com.android.server.net.NetworkStatsServiceTest # PASS
Test: runtest frameworks-services -c com.android.server.NetworkManagementServiceTest # Already failing.
Bug:
31479480
Change-Id: Ifab32c9214e9caab71dbf93b3d3ca88df6f49636
Lorenzo Colitti [Fri, 28 Oct 2016 03:37:38 +0000 (12:37 +0900)]
DO NOT MERGE: Move FakeSettingsProvider to a common location.
(cherry picked from commit
7df1a82802cdf842d07a86a80383c7d5ea7ae53a)
Test: runtest frameworks-util -c com.android.internal.util.test.FakeSettingsProviderTest
Test: runtest frameworks-services -c com.android.server.ConnectivityServiceTest
Test: runtest frameworks-services -c com.android.server.retaildemo.PreloadAppsInstallerTest
Test: runtest frameworks-services -c com.android.server.retaildemo.RetailDemoModeServiceTest
Bug:
31479480
Change-Id: I8d4d4de2937012dd33924f53e68f96241a9b2b4f
Hugo Benichi [Mon, 17 Oct 2016 06:54:51 +0000 (15:54 +0900)]
DO NOT MERGE: ConnectivityServiceTest: mark flaky test as such
This patch extracts into its own independent test a test sub-block looking
for a race condition when not waiting on handlers to become idle:
there is no way to prevent the race from not happening when looking for
it this way. This makes the test flakky.
This new independent test is tagged with @FlakkyTest(tolerance = 3).
Test: ConnectivityServiceTest passes, with higher probability.
Bug:
31479480
(cherry picked from commit
c8c1027762d66c12c9c153ccbb8f80acdee8571c)
Change-Id: I3c702bd981ed80ed606be0fb52d61eb3d7195a6f
Calvin On [Tue, 11 Oct 2016 22:10:46 +0000 (15:10 -0700)]
DO NOT MERGE: Add option to skip and avoid captive portals.
Test: ConnectivityServiceTest updated with test cases.
Test: Manually tested against att-wifi in B42.
Bug:
30222699
(cherry picked from commit
be96da11ccb5dd500f920c3ba90d350857293b3d)
Change-Id: I90c0f97fe0e41de4059bceae7b56ab3a70145696
Hugo Benichi [Mon, 17 Oct 2016 05:21:33 +0000 (14:21 +0900)]
DO NOT MERGE: ApfFilter: use elapsedRealTime for RA lifetime
This patch replaces System.currentTimeMillis() with
SystemClock.elapsedRealTime() to make RA lifetime computation more
resilient to various external events inducing jumps in
currentTimeMillis().
Test: ApfTest passes.
(cherry picked from commit
305af8e98a4fce712c1a93daf3b050dac2e8b91a)
Change-Id: If19011fc0c905948f2e42b975cfcc5f8672a95fb
Hugo Benichi [Tue, 4 Oct 2016 02:24:12 +0000 (11:24 +0900)]
DO NOT MERGE: Do not synchronize boolean reads/writes
This patch removes the synchronization around the private variable
mRunning inside of IpReachabilityMonitor and instead qualifeis the field
as volatile.
Synchronization is not needed for reads/writes on native fields or
object references because they are already guaranteed to be atomic.
Synchronization here was used for enforcing memory visibility across
concurrent threads indirectly through monitor acquire/release.
The volatile keyword achieves this in a more explicit way.
Also, this patch changes the way that probeAll() copies the
IpReachabilityMonitor's mIpWatchList by temporary holding mIpWatchList
keys into an ArrayList instead of a more expensive HashSet. Since Java
HashSet are just degenerated HashMaps, and that key iteration order is
based on key hash, the iteration order over this temporary collection
will be consistent for the same mIpWatchList.
Test: refactoring CL. Existing unit tests still pass.
(cherry picked from commit
b0f1186c034c4df9eb54ed29944d16ce6d7ade56)
Change-Id: I48d2b4d837a459150cd431b400ec01b87b48c014
Hugo Benichi [Thu, 13 Oct 2016 00:26:01 +0000 (09:26 +0900)]
DO NOT MERGE: ApfFilter: systematically use u8, u16, u32 getters
This patch adds a getUint8 getter for ByteBuffers and changes ApfFilter
to make uses of getUint8/16/32 everywhere.
The return types of getUint16 is also changed from long to int, which
will expand gracefully to long as an unsigned int as it is guaranteed to
be positive after getUint16.
Test: ApfTest passes
(cherry picked from commit
995dd94673005b43d32456e2de5fda0090b23576)
Change-Id: I606ebc5aedfcacde400d27cc6bc37145769b122c
Hugo Benichi [Thu, 6 Oct 2016 06:19:36 +0000 (15:19 +0900)]
DO NOT MERGE: Add fuzzing tests to ApfFilter RA processing
Test: added new unit tests
(cherry picked from commit
8acea76a2b7555b3bd5ca1170cca9d09e979fafc)
Change-Id: I847d7e4895766042043c0bba1c9b9a698a705d87
Erik Kline [Wed, 25 Nov 2015 03:49:38 +0000 (12:49 +0900)]
DO NOT MERGE: Support timeouts for requestNetwork() invocations.
(cherry-pick of
06c3ef1367e850746eef0a5462bdce8674d74c30)
(cherry picked from commit
57faba9ec73fbb311d5ca1df3278aee9728589d5)
Bug:
21414325
Change-Id: I1a58823a372154589f972b98c4c428eab0e0523e
Pierre Imai [Mon, 8 Feb 2016 07:01:40 +0000 (16:01 +0900)]
DO NOT MERGE: Silence the obnoxious MTU 0 error message that occur when no MTU is
specified for a given network.
Bug:
10705136
(cherry picked from commit
54f0d9edbf7f6ea6dd805dc77fdbf2c3848188e2)
Change-Id: I89e2fdfbbfa981d435a2974422d9d9c009872d76
Amin Shaikh [Thu, 8 Dec 2016 02:20:55 +0000 (02:20 +0000)]
Merge "Support multiple caches in NetworkScoreService."
am:
78f3f0049e
Change-Id: I37e3f4728c9aa0d931727932a1cd4be3ca6e79bf
Treehugger Robot [Thu, 8 Dec 2016 02:09:39 +0000 (02:09 +0000)]
Merge "Support multiple caches in NetworkScoreService."
Amin Shaikh [Wed, 7 Dec 2016 22:08:09 +0000 (14:08 -0800)]
Support multiple caches in NetworkScoreService.
- Use RemoteCallbackList for managing multiple callbacks
- Add unregisterNetworkScoreCache to the service interface
- Added NetworkScoreServiceTest
Test: runtest frameworks-services
Bug:
32913019
Change-Id: I16ca1682acca9cbe403812e520394688a026414b
Stephen Chen [Wed, 7 Dec 2016 23:13:40 +0000 (23:13 +0000)]
Merge "Clarify doc on NETWORK_RECOMMENDATIONS_ENABLED and WIFI_WAKEUP_ENABLED."
am:
faf3aa697f
Change-Id: Ib43452b0f819c12ec51402151e272ad190fd8362
Michael Plass [Wed, 7 Dec 2016 23:05:29 +0000 (23:05 +0000)]
Merge "Remove user-triggered disconnect counters"
am:
2007ee8de3
Change-Id: I6033a4cb4cdfe21f04ced289ce17e7b3bc734c65
Treehugger Robot [Wed, 7 Dec 2016 23:00:26 +0000 (23:00 +0000)]
Merge "Clarify doc on NETWORK_RECOMMENDATIONS_ENABLED and WIFI_WAKEUP_ENABLED."
Michael Plass [Wed, 7 Dec 2016 22:56:57 +0000 (22:56 +0000)]
Merge "Remove user-triggered disconnect counters"
Jeff Sharkey [Wed, 7 Dec 2016 22:47:46 +0000 (22:47 +0000)]
Merge "Yet another set of installd Binder methods."
am:
c69b210ec8
Change-Id: Iee5ff3acffcf3f26cbf964430952f447c117958f
Jeff Sharkey [Wed, 7 Dec 2016 22:38:48 +0000 (22:38 +0000)]
Merge "Yet another set of installd Binder methods."
Jeff Sharkey [Wed, 7 Dec 2016 21:52:45 +0000 (21:52 +0000)]
Merge "Move dump() to dumpAsync(), more oneway calls."
am:
fedf0503be
Change-Id: I934aa7acbeb4929bfe87e5ade0b960daa3cc88ae
Treehugger Robot [Wed, 7 Dec 2016 21:43:24 +0000 (21:43 +0000)]
Merge "Move dump() to dumpAsync(), more oneway calls."
Jeff Sharkey [Wed, 9 Nov 2016 19:25:44 +0000 (12:25 -0700)]
Move dump() to dumpAsync(), more oneway calls.
When calling out to dump services hosted by external apps, use
dumpAsync() to avoid hanging if the remote process is wedged.
(cherry picked from commit
850c83e6da3b34a4eab804133420247fc9dbb8a1)
Test: builds, boots, runs with minimal logs triggered
Bug:
32715088
Merged-In: I70aa2666ae21dae8f09ded2063bed359c0b210c5
Change-Id: Ic2be10dc8478d613cea6e2c976b9987c250b86b7
Jeff Sharkey [Wed, 7 Dec 2016 17:37:47 +0000 (10:37 -0700)]
Yet another set of installd Binder methods.
Pretty straightforward refactoring.
Test: builds, boots, apps install fine
Bug:
13758960,
30944031
Change-Id: Ide533a04e1e31475a16046722f48b1934d8cacd3
Michael Plass [Mon, 21 Nov 2016 19:35:27 +0000 (11:35 -0800)]
Remove user-triggered disconnect counters
Removes these fields of WifiConfiguration:
numUserTriggeredWifiDisableLowRSSI
numUserTriggeredWifiDisableBadRSSI
numUserTriggeredWifiDisableNotHighRSSI
numTicksAtBadRSSI
numTicksAtNotHighRSSI
numUserTriggeredJoinAttempts
Add parcel test for WifiConfiguration.
Bug:
33013630
Test: unit tests pass
Change-Id: I39566c4e7845b01899739c36d6ec633f272fec6f
Paul Duffin [Wed, 7 Dec 2016 16:47:24 +0000 (16:47 +0000)]
Merge "Add legacy-performance-test-hostdex target"
am:
f9587a35ba
Change-Id: Id400bbe4ca3ab4c348c07c76dbbdf868d9335087
Paul Duffin [Wed, 7 Dec 2016 16:37:10 +0000 (16:37 +0000)]
Merge "Add legacy-performance-test-hostdex target"
Paul Duffin [Wed, 7 Dec 2016 14:21:53 +0000 (14:21 +0000)]
Add legacy-performance-test-hostdex target
This is needed for some internal targets that currently depend
directly on the source files and which break when the source
file is moved.
Bug:
30188076
Test: make legacy-performance-test-hostdex
Change-Id: I653325605204c1f272bd5f669e2297eedeaf7d61
Paul Duffin [Wed, 7 Dec 2016 13:00:32 +0000 (13:00 +0000)]
Merge "Replace core-junit with junit"
am:
6ac5293751
Change-Id: I855552fe62801b2534ef63c2c62919bbd845a9af
Paul Duffin [Wed, 7 Dec 2016 12:52:01 +0000 (12:52 +0000)]
Merge "Replace core-junit with junit"
Erik Kline [Wed, 7 Dec 2016 09:26:05 +0000 (09:26 +0000)]
Merge "Handle IpReachabilityMonitor errors better."
am:
3af34c8e0a
Change-Id: Ie13ed70165359e8f312a3744cc26a8d1b6f4730c
Treehugger Robot [Wed, 7 Dec 2016 09:17:21 +0000 (09:17 +0000)]
Merge "Handle IpReachabilityMonitor errors better."
Erik Kline [Fri, 14 Oct 2016 09:33:22 +0000 (18:33 +0900)]
Handle IpReachabilityMonitor errors better.
If construction of a new IpReachabilityMonitor throws an IAE then
log it and immediately call onProvisioningFailure().
Test: runtest frameworks-wifi
passes, except for selectQualifiedNetworkDoesNotChooseDeletedEphemeral()
which fails with an NPE for unrelated reasons.
Bug:
31038971
Bug:
31742703
Change-Id: Ie91b8bdd509d06ad54d062bf446e74c092eb096c
(cherry picked from commit
e4526604664cb66ecdcbeca4d8f64e8c94750c31)
Jeff Sharkey [Wed, 7 Dec 2016 06:46:15 +0000 (06:46 +0000)]
Merge "Move more installd methods to Binder."
am:
3101778fb2
Change-Id: I35d40a7a2a368cc36a2d265db87328f3f489fec9
Jeff Sharkey [Wed, 7 Dec 2016 06:39:27 +0000 (06:39 +0000)]
Merge "Move more installd methods to Binder."
Andreas Gampe [Wed, 7 Dec 2016 02:12:39 +0000 (02:12 +0000)]
Merge "Workaround for javac compilation issue of lambda code"
am:
90e5fc0970
Change-Id: Ie7f376587c793ef9312626e41ee4be40f66de5f4
Andreas Gampe [Wed, 7 Dec 2016 02:05:08 +0000 (02:05 +0000)]
Merge "Workaround for javac compilation issue of lambda code"
Jeff Sharkey [Tue, 6 Dec 2016 06:39:46 +0000 (23:39 -0700)]
Move more installd methods to Binder.
Test: builds, boots, apps install fine
Bug:
13758960,
30944031
Change-Id: Ic00968214cec03d67fff7964e5175ab9e6132b36
Tomasz Mikolajewski [Wed, 7 Dec 2016 01:50:08 +0000 (01:50 +0000)]
Merge "Fix crashing StrictJarFile due to doubled closing."
am:
68ea36243d
Change-Id: I40c0c1387c2492c8ce4eec2623f25b2f041c13ec