Commit Graph

276909 Commits

Author SHA1 Message Date
Michael Rosenfeld
dc017c4e49 Merge "Copy preload2.jar to build artifacts"
am: 64583c332a

Change-Id: I5cb3a43c09546881872803dabefb23950c0c1c17
2016-12-10 01:01:13 +00:00
Michael Rosenfeld
64583c332a Merge "Copy preload2.jar to build artifacts" 2016-12-10 00:48:52 +00:00
Michael Rosenfeld
d19ea14f30 Copy preload2.jar to build artifacts
Test: local build
Bug: 33492076
Change-Id: I76de648cd1947e49278a678a4c6f1dce8092bbd4
2016-12-09 16:16:54 -08:00
Jeremy Joslin
4150ec18e9 Merge "Update registerNetworkScoreCache() to accept a filter type."
am: a511a07fa3

Change-Id: I51983da8fe63db15d9b38e3ebe4a20cb95cb5f13
2016-12-10 00:06:37 +00:00
Treehugger Robot
a511a07fa3 Merge "Update registerNetworkScoreCache() to accept a filter type." 2016-12-09 23:56:35 +00:00
Jeremy Joslin
823db059e4 Update registerNetworkScoreCache() to accept a filter type.
Defined a new IntDef in NetworkScoreManager named CacheUpdateFilter
with 3 values. Caches must be registered with a filter value and will
only receive updates based on their registered filter. Actual
filtering implementation will follow.

Test: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest
BUG: 32912120
Change-Id: I3ce0bee171e6405176358479fa8a532fd5193824
Merged-In: I8940e0ed1a7bbcb5a81fb3b6a7fafe4fbbc33875
2016-12-09 13:15:15 -08:00
Jeff Sharkey
35cbe8ffb0 Merge "Prepare to move dexopt calls to Binder."
am: d7b144a5e9

Change-Id: I49cce8519d5b09a646609fffc6e62ecbe1a086ef
2016-12-09 16:53:46 +00:00
Jeff Sharkey
d7b144a5e9 Merge "Prepare to move dexopt calls to Binder." 2016-12-09 16:42:25 +00:00
Paul Duffin
28b617bdea Merge "Move android.test classes from core/java to legacy-test/src"
am: 2761ed124a

Change-Id: I0009b93ff096456d7f5fd5f83e71fd4b9bff31db
2016-12-09 15:05:06 +00:00
Paul Duffin
2761ed124a Merge "Move android.test classes from core/java to legacy-test/src" 2016-12-09 14:56:37 +00:00
Hugo Benichi
4180078d0d Merge "Removing bogus file added by mistake"
am: a44c833042

Change-Id: I25ff74ac3e46b60da05b9ab595f87d58bb50b6c0
2016-12-09 10:58:21 +00:00
Przemyslaw Szczepaniak
104e268a14 Merge "Track libcore change 547177ca5c312f84fb22e6e7bf12f54129034e5d"
am: 4ee94a6a9b

Change-Id: I93e4dc42695a35934748e4242bb36e4260cbd3ca
2016-12-09 10:54:03 +00:00
Treehugger Robot
a44c833042 Merge "Removing bogus file added by mistake" 2016-12-09 10:50:11 +00:00
Przemyslaw Szczepaniak
4ee94a6a9b Merge "Track libcore change 547177ca5c312f84fb22e6e7bf12f54129034e5d" 2016-12-09 10:46:19 +00:00
Lorenzo Colitti
1a2fa0f372 Merge changes from topic 'framework-net-aosp'
am: ab4c79bd96

Change-Id: I286110dc7db8424187d50d07fa3f059903cdea03
2016-12-09 09:48:51 +00:00
Hugo Benichi
9f65f04157 DO NOT MERGE: frameworks-test: adding missing @SmallTest
am: cfcc1cb7bf  -s ours

Change-Id: Idc0806748704f86b65dfbe760e7b55c2f61436d0
2016-12-09 09:36:16 +00:00
Hugo Benichi
d84f932680 DO NOT MERGE: Netd events: record connect() success/errno
am: 5d0f28c7fd  -s ours

Change-Id: I833ea69c0a8cb79bcaf9280bd617d0ce7924764c
2016-12-09 09:34:51 +00:00
Lorenzo Colitti
50c77cb9c0 DO NOT MERGE: Add missing dependency.
am: 744b02069d  -s ours

Change-Id: I2bcc3e7eb9d55c4063cdbf6945baa4ce5ce9ba88
2016-12-09 09:34:11 +00:00
Tony Mak
118071a481 DO NOT MERGE: Show notification for always-on app VPN
am: de7f7d195e  -s ours

Change-Id: Icb50333e9ca623f40a8a48c25d28c404748310c2
2016-12-09 09:33:28 +00:00
Stephen Chen
3f5785260e DO NOT MERGE: Implement metered tracking for NetworkStats summary queries.
am: 963e8ddf6d  -s ours

Change-Id: Idfaf31ca77450618391cf2b010ec7fc0961b6dc2
2016-12-09 09:32:43 +00:00
Hugo Benichi
a452f24e30 DO NOT MERGE: NetworkMonitor: send one DNS probe per web probe
am: 2a43b208cc  -s ours

Change-Id: Ic6806b65b46c0e7f68a796db534b319126235129
2016-12-09 09:31:59 +00:00
Hugo Benichi
9908c161ca DO NOT MERGE: NetworkMonitor metrics: add first validation information
am: 21680fd25d  -s ours

Change-Id: Ida088560e94946bc0fa57f59f56007753a197068
2016-12-09 09:31:16 +00:00
Hugo Benichi
0d95fc9552 DO NOT MERGE: APF: also drop any ICMPv6 RSs
am: 02428988ad  -s ours

Change-Id: Iaf8442b9536e8c465fd4336a7706e8fd00933266
2016-12-09 09:30:09 +00:00
Hugo Benichi
a30ae5542b DO NOT MERGE: ConnectivityServiceTest: fix testAvoidBadWifiSettings
am: 53d83d5142  -s ours

Change-Id: I07650e028dbe5be6d04761ae0cbb9e9512d31d53
2016-12-09 09:29:11 +00:00
Hugo Benichi
0bef352535 DO NOT MERGE: Fix ConnectivityServiceTest testRequestBenchmark
am: cbf8ff83a8  -s ours

Change-Id: I6af5dd9e2bf31346578d5fca4a635ba3af2f2099
2016-12-09 09:28:32 +00:00
Hugo Benichi
eb96bb7338 Removing bogus file added by mistake
This patch deletes a bogus file added by mistake in the change with
commit hash 147aa6d53b.

Test: no code change.
Bug: 32198726

Change-Id: Iffc6b3a5ebd854dc81d537576a4405955abacba7
2016-12-09 18:28:19 +09:00
Jeff Sharkey
7c670da7ac DO NOT MERGE: Switch over to new "time.android.com" NTP pool.
am: dda938a698  -s ours

Change-Id: I2b1825f00459952d6f3430c99661aafc907e6c37
2016-12-09 09:27:54 +00:00
Stephen Chen
419a061017 DO NOT MERGE: Define API for metering network stats buckets.
am: dadf6caf9f  -s ours

Change-Id: I3dcf9d32deeb09d08364b135714b84e685767dee
2016-12-09 09:27:11 +00:00
Felipe Leme
fbbaf25665 DO NOT MERGE: Refactored NetworkStatsServiceTest to use Mockito instead of EasyMock.
am: e4c029918f  -s ours

Change-Id: Ieeea6db94be1d402fe8129f02bea2586346dcf76
2016-12-09 09:26:31 +00:00
Felipe Leme
b296948b3b DO NOT MERGE: Use @Ignore to explicitly disable a @Test method.
am: 2026ca147b  -s ours

Change-Id: I17818101fa8f47d285cf772a0f67373c1dda5e30
2016-12-09 09:25:12 +00:00
Felipe Leme
82393f7b98 DO NOT MERGE: Fixed NetworkStatsServiceTest and converted it to JUnit4.
am: 77cba4bdf6  -s ours

Change-Id: I907010456f9bb9674748222fd5e82b8b64dce46f
2016-12-09 09:24:24 +00:00
Jeremy Joslin
12bb3f057b DO NOT MERGE: VPN network stat accounting changes.
am: ffe5a46b3e  -s ours

Change-Id: Ic42723be04158feafd268b3859f0e938d3e36d01
2016-12-09 09:23:37 +00:00
Hugo Benichi
f6cb43ae32 DO NOT MERGE: ConnectivityThread: use lazy holder idiom
am: ce765b7a51  -s ours

Change-Id: I0625013f14e4a2c24a238677a3de50961d114619
2016-12-09 09:22:57 +00:00
Hugo Benichi
7337239702 DO NOT MERGE: ConnectivityManager: use ConnectivityThread looper
am: 1853f78d76  -s ours

Change-Id: Ia41bae1435c94e042358e8b88b42f83cd5359a6e
2016-12-09 09:22:16 +00:00
Hugo Benichi
ef148edaa2 DO NOT MERGE: ConnectivityManager: a simpler CallbackHandler
am: 4983e55853  -s ours

Change-Id: I806d5d79994785357390707d77760af3af725477
2016-12-09 09:21:22 +00:00
Philip P. Moltmann
6e8a33a583 DO NOT MERGE: Indicate the NsdServiceInfo attributes are only filled in for a resolved service.
am: 29154b000f  -s ours

Change-Id: I5c7c11dc4f8112f0ca89b482c2ba10a6a94abfba
2016-12-09 09:20:02 +00:00
Jeremy Klein
3cd1ae2261 DO NOT MERGE: Add a null check for the OnStartTetheringCallback.
am: c8e4cc8e99  -s ours

Change-Id: I3290e0f17c8d29f7e7216687f85b7487a3b85ac5
2016-12-09 09:19:21 +00:00
Lorenzo Colitti
ab4c79bd96 Merge changes from topic 'framework-net-aosp'
* changes:
  DO NOT MERGE: frameworks-test: adding missing @SmallTest
  DO NOT MERGE: Netd events: record connect() success/errno
  DO NOT MERGE: Add missing dependency.
  DO NOT MERGE: Show notification for always-on app VPN
  DO NOT MERGE: Implement metered tracking for NetworkStats summary queries.
  DO NOT MERGE: NetworkMonitor: send one DNS probe per web probe
  DO NOT MERGE: NetworkMonitor metrics: add first validation information
  DO NOT MERGE: APF: also drop any ICMPv6 RSs
  DO NOT MERGE: ConnectivityServiceTest: fix testAvoidBadWifiSettings
  DO NOT MERGE: Fix ConnectivityServiceTest testRequestBenchmark
  DO NOT MERGE: Switch over to new "time.android.com" NTP pool.
  DO NOT MERGE: Define API for metering network stats buckets.
  DO NOT MERGE: Refactored NetworkStatsServiceTest to use Mockito instead of EasyMock.
  DO NOT MERGE: Use @Ignore to explicitly disable a @Test method.
  DO NOT MERGE: Fixed NetworkStatsServiceTest and converted it to JUnit4.
  DO NOT MERGE: VPN network stat accounting changes.
  DO NOT MERGE: ConnectivityThread: use lazy holder idiom
  DO NOT MERGE: ConnectivityManager: use ConnectivityThread looper
  DO NOT MERGE: ConnectivityManager: a simpler CallbackHandler
  DO NOT MERGE: Indicate the NsdServiceInfo attributes are only filled in for a resolved service.
  DO NOT MERGE: Add a null check for the OnStartTetheringCallback.
2016-12-09 09:11:22 +00:00
Hugo Benichi
cfcc1cb7bf DO NOT MERGE: frameworks-test: adding missing @SmallTest
This activates all frameworks-test tests in runs of the continuous
platform tests.

Test: $ runtest frameworks-net passes (expect Tether
Bug: 32561414
(cherry picked from commit fa8a6f6220)

Change-Id: I7b0706a7e3368f971d508388e8ad4afc5de9d646
2016-12-09 14:35:05 +09:00
Hugo Benichi
5d0f28c7fd DO NOT MERGE: Netd events: record connect() success/errno
Test: $ runtest frameworks-net pass
Bug: 32198976

(cherry picked from commit 8b06bcdfd2)
2016-12-09 14:34:39 +09:00
Lorenzo Colitti
744b02069d DO NOT MERGE: Add missing dependency.
Change-Id: I5deb8e03eb368ab7003f9376f7b4459d2ef5e934
2016-12-09 14:23:17 +09:00
Tony Mak
de7f7d195e DO NOT MERGE: Show notification for always-on app VPN
This is the same notification as the one shown during legacy lockdown
mode, sans the 'reset' button.

The notification is only shown during times when VPN has not yet
established or has failed, for example during boot or after a crash.

Bug: 29123115

(cherry picked from commit 1a405fe300)

Change-Id: I929a05c24df01e21415535a333bb14ac4b790a9d
2016-12-09 14:23:10 +09:00
Stephen Chen
963e8ddf6d DO NOT MERGE: Implement metered tracking for NetworkStats summary queries.
Dependent on ag/1550196 where API is defined.

Bug: 31015360
Bug: 26545374
Test: runtest --path
frameworks/base/core/tests/coretests/src/android/net/NetworkStatsTest.java,
other test classes.

(cherry picked from commit 2514787897)

Change-Id: I46da93ba4afa968facf98f7c3d844fd0c469095a
2016-12-09 13:59:33 +09:00
Hugo Benichi
2a43b208cc DO NOT MERGE: NetworkMonitor: send one DNS probe per web probe
This patch changes sligthly the two web probes mechanism for captive
portal detection and network validation so that DNS resolution is always
done for both probes.

In general the target web servers of the two parallel HTTP and HTTPS probes
are now different. This introduces a bias in the latency measurement of
th HTTPS probe since this latency will also include DNS resolution in
general.

Test: manual verification + $ runtest frameworks-net
Bug: 32198726

(cherry picked from commit ab61e7c324)

Change-Id: I3b32ae451f2241849fffe24956758a9f571b1ef1
2016-12-09 13:59:20 +09:00
Hugo Benichi
21680fd25d DO NOT MERGE: NetworkMonitor metrics: add first validation information
This patch adds first validation information to:
  - ValidationProbeEvent, by extending the probe_type int field of to
    also include a bit indicating if the probe was part of a first
    validation attempt or not.
  - NetworkMonitorEvent, by defining new contants for the event_type
    field.

Test: $ runtest frameworks-net
      + manually generating events and inspecting the
        output of $ adb shell dumpsys connmetrics list
Bug: b/32198726

(cherry picked from commit 147aa6d53b)

Change-Id: Ie7a62c4f62a13ce52806d3adaa9e627cb246073c
2016-12-09 13:59:20 +09:00
Hugo Benichi
02428988ad DO NOT MERGE: APF: also drop any ICMPv6 RSs
Test: new unit test + $ runtest franeworks-net
Bug: 32833400

(cherry picked from commit f98182ef5e)

Change-Id: Ifaf6e778c811c7d865c790a293b1fce3f43cad1c
2016-12-09 13:59:19 +09:00
Hugo Benichi
53d83d5142 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 99c8294ef0)

Change-Id: If41a24989d5f65aeb439f68741f511b5eb53b18d
2016-12-09 13:59:19 +09:00
Hugo Benichi
cbf8ff83a8 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 38be57b438)

Change-Id: I196ab9ef7f5abe456a783eed65db09279d2ecb8c
2016-12-09 13:59:18 +09:00
Jeff Sharkey
dda938a698 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 d3f689bf14)

Change-Id: I7da416099ae903fd92beb516251ef4e51673eecf
2016-12-09 13:59:18 +09:00
Stephen Chen
dadf6caf9f 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 9ac251d116)

Change-Id: I6a2fcc8577d62daa8823dff9e0128a5cf39ede7b
2016-12-09 13:59:17 +09:00