Bill Rassieur
5bf9057c82
Merge master@5428150 into git_qt-dev-plus-aosp.
...
Change-Id: If790e058d4ec8a5024363b6aa1354a356c2f2d76
BUG: 129345239
2019-04-02 18:31:08 +00:00
Junyu Lai
43fae5d9e3
Merge "Ignore the asynchronous result while stopping keepalive" am: d1723694a4 am: c82200fb29
...
am: d20b14db24
2019-04-02 04:24:18 -07:00
Junyu Lai
d20b14db24
Merge "Ignore the asynchronous result while stopping keepalive" am: d1723694a4
...
am: c82200fb29
2019-04-02 04:15:07 -07:00
Junyu Lai
c82200fb29
Merge "Ignore the asynchronous result while stopping keepalive"
...
am: d1723694a4
2019-04-02 04:05:49 -07:00
Junyu Lai
d1723694a4
Merge "Ignore the asynchronous result while stopping keepalive"
2019-04-02 10:48:23 +00:00
Paul Hu
91252ebe9a
Merge "Address leftover comments on 923337 and 930217." am: b5db40605c am: 5d94f74e87
...
am: 426f2771e0
2019-04-02 01:29:08 -07:00
Paul Hu
426f2771e0
Merge "Address leftover comments on 923337 and 930217." am: b5db40605c
...
am: 5d94f74e87
2019-04-02 01:14:24 -07:00
Paul Hu
5d94f74e87
Merge "Address leftover comments on 923337 and 930217."
...
am: b5db40605c
2019-04-02 00:58:18 -07:00
Paul Hu
b5db40605c
Merge "Address leftover comments on 923337 and 930217."
2019-04-02 07:39:04 +00:00
Paul Hu
0ed9ca1ca2
Merge "Fix IpPrefixTest#testContainsInetAddress fail." am: 79a5776e79 am: 0756750737
...
am: 8b207facf4
2019-04-01 19:24:38 -07:00
Paul Hu
8b207facf4
Merge "Fix IpPrefixTest#testContainsInetAddress fail." am: 79a5776e79
...
am: 0756750737
2019-04-01 18:59:35 -07:00
Paul Hu
0756750737
Merge "Fix IpPrefixTest#testContainsInetAddress fail."
...
am: 79a5776e79
2019-04-01 18:47:42 -07:00
Paul Hu
79a5776e79
Merge "Fix IpPrefixTest#testContainsInetAddress fail."
2019-04-02 01:33:02 +00:00
Chalard Jean
54209f41c5
Merge "Cleanup SystemReady in the network stack" am: 37576c4dde am: aa2878a2e0
...
am: 17f183f66a
2019-04-01 18:13:24 -07:00
Chalard Jean
17f183f66a
Merge "Cleanup SystemReady in the network stack" am: 37576c4dde
...
am: aa2878a2e0
2019-04-01 17:41:35 -07:00
Chalard Jean
aa2878a2e0
Merge "Cleanup SystemReady in the network stack"
...
am: 37576c4dde
2019-04-01 17:12:06 -07:00
Chalard Jean
37576c4dde
Merge "Cleanup SystemReady in the network stack"
2019-04-01 23:28:47 +00:00
paulhu
da137d9082
Fix IpPrefixTest#testContainsInetAddress fail.
...
The argument of IpPreFix#contains() has been marked as @NonNull.
So the IpPrefixTest#testContainsInetAddress should not test
contains() method wiht null object.
Bug: None
Test: atest FrameworksNetTests
atest IpPrefixTest#testContainsInetAddress
Change-Id: I2f6bee19514dc47702f64d2a2bbf02d8b7b1b407
2019-04-02 00:49:00 +08:00
Xiao Ma
b6fd5dc3c0
Merge "Add DHCP address lease expiry in IpMemoryStore." am: 0f1ffb3b77 am: 5bdb41fdcf
...
am: 72da4758de
2019-04-01 06:35:34 -07:00
Xiao Ma
72da4758de
Merge "Add DHCP address lease expiry in IpMemoryStore." am: 0f1ffb3b77
...
am: 5bdb41fdcf
2019-04-01 06:27:18 -07:00
Xiao Ma
5bdb41fdcf
Merge "Add DHCP address lease expiry in IpMemoryStore."
...
am: 0f1ffb3b77
2019-04-01 06:16:08 -07:00
Xiao Ma
0f1ffb3b77
Merge "Add DHCP address lease expiry in IpMemoryStore."
2019-04-01 12:59:20 +00:00
paulhu
a9a6e2a2a2
Address leftover comments on 923337 and 930217.
...
- Restrict unprivileged apps to use
NetworkRequest.Builder#setSignalStrength.
- Remove the "throws NullPointerException" in
CaptivePortalProbeSpec constructor.
- Remove the null check in LinkProperties.
- Add annotataion into all ConnectivityManager.NetworkCallback
methods.
Change-Id: Id275cac1d6a30d7515cd7b113394f5e8a0179314
Fix: 129097486
Test: atest FrameworksNetTests
2019-04-01 16:24:10 +08:00
junyulai
71d379fe89
Ignore the asynchronous result while stopping keepalive
...
Currently, onStopped callback are synchronizely triggered when
stop() was called, since the framework don't really care
about the result of stopping keepalive.
However, if keepalive failed to stop for some reason, the
handleStopKeepalive was called mistakenly and trigger additional
callback that fail the test case.
This commit is the behavior change prior to state machine
refactoring, and introduce a stopping state for ignoring the
result in the stopping state.
Bug: 129512753
Bug: 123988249
Test: 1. atest com.android.server.ConnectivityServiceTest \
#testNattSocketKeepalives --generate-new-metrics 100
2. atest FrameworksNetTests
Change-Id: I4fa94e0740ba488fb5fe7ac7c3812c195dd0ec4c
2019-04-01 16:22:02 +08:00
Paul Hu
13a6f56201
Merge "Fix ApfCapabilities, LinkAddress, RouteInfo, IpPrefix API issues." am: 2971c23c97 am: c66885bc37
...
am: 0dcc2d8053
2019-04-01 00:52:53 -07:00
Paul Hu
0dcc2d8053
Merge "Fix ApfCapabilities, LinkAddress, RouteInfo, IpPrefix API issues." am: 2971c23c97
...
am: c66885bc37
2019-04-01 00:43:33 -07:00
Paul Hu
c66885bc37
Merge "Fix ApfCapabilities, LinkAddress, RouteInfo, IpPrefix API issues."
...
am: 2971c23c97
2019-04-01 00:34:26 -07:00
Paul Hu
2971c23c97
Merge "Fix ApfCapabilities, LinkAddress, RouteInfo, IpPrefix API issues."
2019-04-01 07:20:53 +00:00
Remi NGUYEN VAN
ede73bb437
Merge "Fix race when starting NetworkMonitor" am: ca5b44477a am: 9e85030e71
...
am: bf761cce3e
2019-03-31 21:35:25 -07:00
Chalard Jean
b1b282c8ee
Cleanup SystemReady in the network stack
...
The system server (in SystemServer.java) defines the boot
sequence, during which an event called SystemReady happens.
This corresponds to a time when critical system services
that are depended upon by other components in the system
server are ready to handle requests from their dependencies.
Some system services are listening to this event to defer
initializations that depend on the critical services.
Because the network stack is only started after SystemReady,
there is no way any NetworkMonitor may be started before
SystemReady. Remove the associated mechanism.
Fix: 129376083
Test: FrameworksNetTests
Change-Id: I071eeb10d0b7c4f71af6653d322c7b442b2cc7ee
2019-04-01 13:32:25 +09:00
Remi NGUYEN VAN
bf761cce3e
Merge "Fix race when starting NetworkMonitor" am: ca5b44477a
...
am: 9e85030e71
2019-03-31 21:25:12 -07:00
Remi NGUYEN VAN
9e85030e71
Merge "Fix race when starting NetworkMonitor"
...
am: ca5b44477a
2019-03-31 21:13:48 -07:00
Remi NGUYEN VAN
ca5b44477a
Merge "Fix race when starting NetworkMonitor"
2019-04-01 03:54:03 +00:00
Remi NGUYEN VAN
f59a5d4580
Fix race when starting NetworkMonitor
...
NetworkMonitor obtained LinkProperties and NetworkCapabilities via
synchronous calls to ConnectivityManager after receiving an asynchronous
notification, which is prone to races: the network could be gone before
the LinkProperties/NetworkCapabilities can be fetched.
Fix the race by passing LinkProperties/NetworkCapabilities directly to
NetworkMonitor in the asynchronous notifications.
Test: atest FrameworksNetTests NetworkStackTests
Test: booted, WiFi works
Bug: 129375892
Change-Id: I200ac7ca6ff79590b11c9be705f650c92fd3cb63
2019-04-01 11:33:10 +09:00
paulhu
6f2c1b5f78
Fix ApfCapabilities, LinkAddress, RouteInfo, IpPrefix API issues.
...
Fix: 129362082
Fix: 129361362
Fix: 129360330
Fix: 129362379
Test: atest FrameworksNetTests NetworkStackTests
Change-Id: I05fbc6f98207d5cf002e3cbc5829040af7d6be52
2019-04-01 10:23:51 +08:00
Luke Huang
511b9e7be1
Merge "Minor change for async DNS API" am: 80be1b1127 am: a3cac1b558
...
am: 9e70eedefb
2019-03-29 12:03:25 -07:00
Luke Huang
9e70eedefb
Merge "Minor change for async DNS API" am: 80be1b1127
...
am: a3cac1b558
2019-03-29 11:48:51 -07:00
Luke Huang
a3cac1b558
Merge "Minor change for async DNS API"
...
am: 80be1b1127
Change-Id: I54a7695484b6523a92eaf246a4bb836fabc8957f
2019-03-29 11:38:24 -07:00
Lorenzo Colitti
6fdec9806c
Merge "Unremove DnsResolver#query method used by external developers" am: 3dd6df002b am: 2735dbeb27
...
am: b09fa5d9e5
2019-03-29 08:38:15 -07:00
Lorenzo Colitti
b09fa5d9e5
Merge "Unremove DnsResolver#query method used by external developers" am: 3dd6df002b
...
am: 2735dbeb27
2019-03-29 08:23:31 -07:00
Lorenzo Colitti
2735dbeb27
Merge "Unremove DnsResolver#query method used by external developers"
...
am: 3dd6df002b
Change-Id: I0c8b5b5fe68b99cacc4da10ae27b69fcab8685b7
2019-03-29 08:09:18 -07:00
Luke Huang
10331f6810
Minor change for async DNS API
...
do the minor changes to address comments before
Bug: 129395490
Test: atest DnsResolverTest
Change-Id: I56e2e5bc4352ff5c979579247a333a41950079da
2019-03-29 18:12:26 +08:00
Luke Huang
4430601e38
Unremove DnsResolver#query method used by external developers
...
This method was removed as part of addressing API council feedback in b/129261432
Add back previous DnsResolver#query which is already being used by developers.
Bug: 129395490
Test: atest DnsResolverTest
Change-Id: Ic956db204f3940d39d42e1b11dda39e57d356fad
2019-03-29 18:12:26 +08:00
Luke Huang
592905c826
Merge "Use IDnsResolver instead of INetd for resolver related binder commands" am: 8c3d79e813 am: 3b2c0dda05
...
am: bdf234395b
2019-03-29 02:24:24 -07:00
Luke Huang
bdf234395b
Merge "Use IDnsResolver instead of INetd for resolver related binder commands" am: 8c3d79e813
...
am: 3b2c0dda05
2019-03-29 02:10:55 -07:00
Luke Huang
3b2c0dda05
Merge "Use IDnsResolver instead of INetd for resolver related binder commands"
...
am: 8c3d79e813
2019-03-29 01:57:44 -07:00
Luke Huang
8c3d79e813
Merge "Use IDnsResolver instead of INetd for resolver related binder commands"
2019-03-29 08:45:19 +00:00
Xiao Ma
314a2312aa
Add DHCP address lease expiry in IpMemoryStore.
...
Bug:122710829
Test: atest FrameworksNetTests
Change-Id: I643fe1231edcd18923514ab66c64a6cf83e69443
2019-03-29 16:51:47 +09:00
Luke Huang
000ab0cf42
Merge "Fix cancellation race problem for aysnc DNS API" am: b08fbde438 am: c8e5e12a32
...
am: af155d0716
2019-03-28 21:18:41 -07:00
Bill Rassieur
d831a04b97
Merge master@5406228 into git_qt-dev-plus-aosp.
...
Change-Id: I6ec4d7ef40a971744cbc14ebf3a9ec1071c0bb0a
BUG: 129345239
2019-03-29 04:16:19 +00:00
