Commit Graph

6334 Commits

Author SHA1 Message Date
Junyu Lai
23bf315b90 Merge "Reveal the call trace of failed test cases which run in executors" am: 43dc93b180 am: ca9b494b83
am: a71b378095

Change-Id: I023c8140c94966479db7f12647838699324462af
2019-03-26 00:13:47 -07:00
Junyu Lai
a71b378095 Merge "Reveal the call trace of failed test cases which run in executors" am: 43dc93b180
am: ca9b494b83

Change-Id: I1a2d312842f33a9b7b98da925b332becaece3cb2
2019-03-26 00:03:27 -07:00
Junyu Lai
ca9b494b83 Merge "Reveal the call trace of failed test cases which run in executors"
am: 43dc93b180

Change-Id: Ia0de9ac66ad2137c6d1147e2ad5c899ab7b33ece
2019-03-25 23:54:01 -07:00
Junyu Lai
43dc93b180 Merge "Reveal the call trace of failed test cases which run in executors" 2019-03-26 06:38:39 +00:00
Remi NGUYEN VAN
c1687b4a7a Merge "Add nullability annotations" am: 9049f8617b am: a475897492
am: ea8fce17c7

Change-Id: I43088399da1d81556ab903ef1ca716439129f00d
2019-03-25 06:56:43 -07:00
Mark Chien
de617f4a74 Merge "[TCPKeepalive] Fill correct TOS and TTL value" am: bd1567cbae am: 493e5319f6
am: 1368554fc5

Change-Id: I80c56a14a0be2e6b7996f2bcb9a1a320f0c2c058
2019-03-25 06:44:17 -07:00
Remi NGUYEN VAN
ea8fce17c7 Merge "Add nullability annotations" am: 9049f8617b
am: a475897492

Change-Id: Ic81850c2976e7412e85856c5d1336f30d0691125
2019-03-25 06:42:49 -07:00
Mark Chien
1368554fc5 Merge "[TCPKeepalive] Fill correct TOS and TTL value" am: bd1567cbae
am: 493e5319f6

Change-Id: I0de6ff4a97f64b0ba72856c9d9d6fe57d677e5fa
2019-03-25 06:34:45 -07:00
Remi NGUYEN VAN
a475897492 Merge "Add nullability annotations"
am: 9049f8617b

Change-Id: I47ec92d406b16eaff049ad4a5af1b1b407418e4d
2019-03-25 06:33:40 -07:00
Mark Chien
493e5319f6 Merge "[TCPKeepalive] Fill correct TOS and TTL value"
am: bd1567cbae

Change-Id: I8c5993aadd1bfa79290821215f6dae2bba057c5f
2019-03-25 06:25:42 -07:00
Treehugger Robot
9049f8617b Merge "Add nullability annotations" 2019-03-25 13:19:19 +00:00
Mark Chien
bd1567cbae Merge "[TCPKeepalive] Fill correct TOS and TTL value" 2019-03-25 13:10:17 +00:00
junyulai
b454b0fc0e Reveal the call trace of failed test cases which run in executors
Currently, the fails in testTcpSocketKeepalives are triggered by
fail() inside the executor, which is hiding the actual call trace
but only message remains. And it made the fail case hard to
debug.

So this commit is to bubble up the Exception by using a custom
functional interface.

Bug: 123987272
Test: 1. atest FrameworksNetTests
      2. manually fail the test case and see the call trace

Change-Id: I125e673938a5e9d1de86f83c1a732227a4bd3207
2019-03-25 12:56:47 +00:00
Junyu Lai
639ba7742d Merge "Fix SocketKeepalive APIs which do not meet API review requirement" am: 5fdd1748fa am: b7ed180e64
am: 7f8cfa3536

Change-Id: I873a82de90efce6f3baa17761c0576dc9c8210be
2019-03-25 04:16:18 -07:00
Junyu Lai
7f8cfa3536 Merge "Fix SocketKeepalive APIs which do not meet API review requirement" am: 5fdd1748fa
am: b7ed180e64

Change-Id: Iead39e877aec917ff3c409fda1ff0c4dbaa21fcb
2019-03-25 04:06:39 -07:00
Junyu Lai
b7ed180e64 Merge "Fix SocketKeepalive APIs which do not meet API review requirement"
am: 5fdd1748fa

Change-Id: Id82be12a54e676c4ad18900ae910e6d08079e62c
2019-03-25 03:57:32 -07:00
Junyu Lai
5fdd1748fa Merge "Fix SocketKeepalive APIs which do not meet API review requirement" 2019-03-25 10:42:37 +00:00
junyulai
6114378ad2 Fix SocketKeepalive APIs which do not meet API review requirement
Per API review, change the use of FileDescriptor to
ParcelFileDescriptor.
This change also fix nullability according to API review
feedbacks.

Fix: 126698610
Fix: 126699425
Fix: 126699232
Fix: 126700278

Test: 1. m -j
      2. atest FrameworksNetTests --generate-new-metrics 50
      3. m -j doc-comment-check-docs
Change-Id: I19476c50dd1ca290bf3f41973829da2bd229796a
2019-03-25 15:56:35 +08:00
Remi NGUYEN VAN
e04dfba3cf Add nullability annotations
Add nullability annotations on the following methods:
 - StaticIpConfiguration#getRoutes
 - ValidationProbeEvent#getProbeName

Test: m
Bug: 128935825
Change-Id: I1c17d200f3125e684c4e4d67b2f7f079eda310b6
2019-03-25 16:46:34 +09:00
Remi NGUYEN VAN
b74f6131c1 Merge "Separate NetworkMonitor/framework portal URL" am: 391c40841f am: a988825101
am: cba999788a

Change-Id: I85e744d94d96ecf9ac558e62016418d8199bb98c
2019-03-24 20:23:39 -07:00
markchien
d2c678b32f [TCPKeepalive] Fill correct TOS and TTL value
Fill correct TOS/TTL value by fetching them from kernel with
getsockopt.

bug: 123967966
Test: -build, flash, boot
      -atest FrameworksNetTests

Change-Id: I75b1be51040b4a381163958b4cddd27dbb22bac1
2019-03-25 11:14:57 +08:00
Remi NGUYEN VAN
cba999788a Merge "Separate NetworkMonitor/framework portal URL" am: 391c40841f
am: a988825101

Change-Id: Ic6c16ccf98e943b7003524f6e2b98e100e543221
2019-03-24 20:11:49 -07:00
Remi NGUYEN VAN
79c7c7b6b9 [automerger skipped] Merge "Fix API in CaptivePortal and ConnectivityManager" am: 998e6ea285 am: e380d9ce11
am: 2dcb145bbe -s ours
am skip reason: change_id I09545c00af3519dbf141dd5951b28f49e37b3e80 with SHA1 65c187466b is in history

Change-Id: I793a60492ba7b63c6dea2937e7fc651a1ab617b9
2019-03-24 20:10:38 -07:00
Remi NGUYEN VAN
a988825101 Merge "Separate NetworkMonitor/framework portal URL"
am: 391c40841f

Change-Id: I1926527f7875e459b4d3c84bfcd8b3aac9562cae
2019-03-24 20:02:39 -07:00
Remi NGUYEN VAN
2dcb145bbe Merge "Fix API in CaptivePortal and ConnectivityManager" am: 998e6ea285
am: e380d9ce11

Change-Id: Ibe9d16bbf1e794eb05166ad9c6bccb3ad5bcae9d
2019-03-24 19:57:01 -07:00
Remi NGUYEN VAN
391c40841f Merge "Separate NetworkMonitor/framework portal URL" 2019-03-25 02:50:37 +00:00
Remi NGUYEN VAN
e380d9ce11 Merge "Fix API in CaptivePortal and ConnectivityManager"
am: 998e6ea285

Change-Id: I4cc3c61232c74bafe4eb549c1aba5de20a8bb3ff
2019-03-24 19:46:32 -07:00
Treehugger Robot
998e6ea285 Merge "Fix API in CaptivePortal and ConnectivityManager" 2019-03-25 02:37:28 +00:00
Remi NGUYEN VAN
338eb2a1ec Fix API in CaptivePortal and ConnectivityManager
- Remove CaptivePortal constructor from SystemApi. This constructor was
   added in Q timeframe and ends up being unnecessary since
   CaptivePortal creation was refactored to ConnectivityService because
   of visibility issues on ICaptivePortal.
 - Rename getAvoidBadWifi to shouldAvoidBadWifi
 - Add permission annotation for shouldAvoidBadWifi

(already merged in internal as:
I09545c00af3519dbf141dd5951b28f49e37b3e80)

Test: flashed, WiFi and captive portal works
Bug: 128935314
Bug: 128935673
Merged-In: I09545c00af3519dbf141dd5951b28f49e37b3e80
Change-Id: I7395d4a4db6a64398a827692aee1956c011873e5
2019-03-25 01:43:48 +00:00
Varun Anand
0c17614d41 [automerger skipped] Merge "Revert "Revert "Update VPN capabilities when its underlying network set is null.""" into pi-dev am: dea6865011 -s ours
am: d3e6645e75 -s ours
am skip reason: change_id Id0abc4d304bb096e92479a118168690ccce634ed with SHA1 273f900b3b is in history

Change-Id: Ibe57fcb06756943987e70b7e38e57a07f71de4e6
2019-03-22 12:37:54 -07:00
Varun Anand
b317e47d46 [automerger skipped] Revert "Revert "Update VPN capabilities when its underlying network set is null."" am: 1a385c1b33 -s ours
am: 22c05491d5 -s ours
am skip reason: change_id Id0abc4d304bb096e92479a118168690ccce634ed with SHA1 273f900b3b is in history

Change-Id: I020ffc31fb0ef41332df37110bb0a8b01e76c976
2019-03-22 12:06:23 -07:00
Varun Anand
d3e6645e75 [automerger skipped] Merge "Revert "Revert "Update VPN capabilities when its underlying network set is null.""" into pi-dev
am: dea6865011 -s ours
am skip reason: change_id Id0abc4d304bb096e92479a118168690ccce634ed with SHA1 273f900b3b is in history

Change-Id: I0634f41f9b3be7cc640b31ab3067708f99759831
2019-03-22 12:02:13 -07:00
Varun Anand
f603686614 [automerger skipped] Merge "Remove ConnectivityManager and its usages from NetworkStatsService." into pi-dev am: 04f4e5c2bc -s ours
am: 99e657f87a -s ours
am skip reason: change_id I57e117bb4e9efe491b19d6b5a479f2d58d1c58e6 with SHA1 65d59a826f is in history

Change-Id: I34c36c55ba985118ffc2210b2e05daab2a0ea8e8
2019-03-22 12:02:12 -07:00
Varun Anand
22c05491d5 [automerger skipped] Revert "Revert "Update VPN capabilities when its underlying network set is null.""
am: 1a385c1b33 -s ours
am skip reason: change_id Id0abc4d304bb096e92479a118168690ccce634ed with SHA1 273f900b3b is in history

Change-Id: I98242257e569eeac747c0328dfa6381e49e7c0b0
2019-03-22 11:45:16 -07:00
Varun Anand
99e657f87a [automerger skipped] Merge "Remove ConnectivityManager and its usages from NetworkStatsService." into pi-dev
am: 04f4e5c2bc -s ours
am skip reason: SHA1 04f4e5c2bc skipped by user vaanand

Change-Id: Ieee5f28f6d10b0d2b8a7b3eb0272297f148ef03f
2019-03-22 11:39:41 -07:00
Lorenzo Colitti
f5773c7279 Merge "Fix API in CaptivePortal and ConnectivityManager" 2019-03-22 11:46:21 +00:00
Lucas Lin
52fda28a8a Merge "Enable PARTIAL_CONNECTIVITY dialog" am: dd7df788e8 am: 7b6be6f338
am: f7d18ebd53

Change-Id: I2ba8244fe582c4194f9d2a60d9562b12d5c8e431
2019-03-22 03:50:47 -07:00
Luke Huang
44e37b74f3 Merge "Support query cancellation for async DNS API" am: fb47755153 am: b899f2b3bc
am: 79de471561

Change-Id: I034361541f64c10d72474beaefdb3547c9c2733e
2019-03-22 03:35:57 -07:00
Remi NGUYEN VAN
65c187466b Fix API in CaptivePortal and ConnectivityManager
- Remove CaptivePortal constructor from SystemApi. This constructor was
   added in Q timeframe and ends up being unnecessary since
   CaptivePortal creation was refactored to ConnectivityService because
   of visibility issues on ICaptivePortal.
 - Rename getAvoidBadWifi to shouldAvoidBadWifi
 - Add permission annotation for shouldAvoidBadWifi

Test: flashed, WiFi and captive portal works
Bug: 128935314
Bug: 128935673
(clean cherry-pick of AOSP I7395d4a4db6a64398a827692aee1956c011873e5)

Change-Id: I09545c00af3519dbf141dd5951b28f49e37b3e80
2019-03-22 17:16:52 +09:00
Remi NGUYEN VAN
69a57cb6d0 Separate NetworkMonitor/framework portal URL
The framework cannot return URLs used by the updatable NetworkStack,
which may use configurable URLs, changing URLs, or mechanisms not
involving URLs to detect captive portals. NetworkMonitor has already
been using random fallback URLs for a while that do not match the value
returned by ConnectivityManager#getCaptivePortalServerUrl.

With this change, the default value returned by the framework is
configured in framework resources as
config_networkDefaultCaptivePortalServerUrl. NetworkMonitor behavior may
change as it is an updatable component, but the current URL is
configured in NetworkMonitor resources as
config_captive_portal_http_url.

Test: flashed, booted, WiFi and captive portal working
Test: ConnectivityManager#getCaptivePortalServerUrl returns correct
      value.
Bug: 127908503
Change-Id: I371dedc5b22efa909d7fd58e1ebe9b8aaced9780
2019-03-22 15:11:14 +09:00
Lucas Lin
f7d18ebd53 Merge "Enable PARTIAL_CONNECTIVITY dialog" am: dd7df788e8
am: 7b6be6f338

Change-Id: I2e1947cdf6e084aefd4d2ccd7b345df79c62e383
2019-03-21 21:40:39 -07:00
Lucas Lin
7b6be6f338 Merge "Enable PARTIAL_CONNECTIVITY dialog"
am: dd7df788e8

Change-Id: I88ca44ef0c0a7cf48538421022d0fed10d15fc26
2019-03-21 21:30:48 -07:00
Lucas Lin
dd7df788e8 Merge "Enable PARTIAL_CONNECTIVITY dialog" 2019-03-22 04:17:43 +00:00
Luke Huang
79de471561 Merge "Support query cancellation for async DNS API" am: fb47755153
am: b899f2b3bc

Change-Id: I890bbb94bf1b8e2242efeb5c868e289a8ae4a95d
2019-03-21 21:13:29 -07:00
Luke Huang
b899f2b3bc Merge "Support query cancellation for async DNS API"
am: fb47755153

Change-Id: I400d98e13cf36ca16c3743eddee96bfae4b47b5c
2019-03-21 20:50:18 -07:00
Luke Huang
fb47755153 Merge "Support query cancellation for async DNS API" 2019-03-22 03:26:21 +00:00
lucaslin
32ecfc4c59 Enable PARTIAL_CONNECTIVITY dialog
Enable PARTIAL_CONNECTIVITY dialog to complete the function.

Bug: 113450764
Test: 1. Build pass
      2. atest FrameworksNetTests
      3. atest NetworkStackTests
      4. Change captive_portal_https_url to https://invalid.com
      to simulate partial connectivity.

Change-Id: I5c9fe7a898d30d2f7f75142c85e73fefc257a147
2019-03-22 09:10:08 +08:00
Paul Hu
9acc3e21d1 Merge "Fix Automated API Review issues." am: e9109ceb23 am: fa662c4b91
am: 67646b0f22

Change-Id: Iba1630161579571d4975aba9bbd5c767f82c8a98
2019-03-21 11:54:51 -07:00
Paul Hu
67646b0f22 Merge "Fix Automated API Review issues." am: e9109ceb23
am: fa662c4b91

Change-Id: I881ceb928c0cf8663b0de5f2451846bfe39f2090
2019-03-21 11:01:28 -07:00
Paul Hu
fa662c4b91 Merge "Fix Automated API Review issues."
am: e9109ceb23

Change-Id: I9c007c129269a80d9aede31c8980dbd42e9f1f84
2019-03-21 10:46:03 -07:00