Commit Graph

7376 Commits

Author SHA1 Message Date
Luke Huang
387e63d68b Merge "Add Rfc6724 style sort for DnsResolver and fix potential bug" am: 7a1133eb44
am: d352f4ca85

Change-Id: Ic356f42b46a3ad170fb01f22d9b3e0b7bf1585d4
2019-05-23 07:23:31 -07:00
Remi NGUYEN VAN
b68b05d1e5 [automerger skipped] Merge "Properly use versioned interfaces." into qt-dev am: efc774b76c
am: 19420eb973 -s ours
am skip reason: change_id Idf49e840263ef32b9ee4fafa6718d4f893ea7c87 with SHA1 91ddb23d66 is in history

Change-Id: Ib434f16bb93ba1e847fe3305ff9eb947198c6e3e
2019-05-23 06:37:13 -07:00
Remi NGUYEN VAN
be092469ac [automerger skipped] Merge "Properly use versioned interfaces." into qt-dev
am: efc774b76c -s ours
am skip reason: change_id Idf49e840263ef32b9ee4fafa6718d4f893ea7c87 with SHA1 91ddb23d66 is in history

Change-Id: I43fe257d42daf3c948bae8a669f19527b99cfab8
2019-05-23 06:02:00 -07:00
Chiachang Wang
eff1897661 Update multiple validation result to ConnectivityService
Once a network is determined to have partial connectivity, it
cannot go back to full connectivity without a disconnect. This
is because NetworkMonitor can only communicate either
PARTIAL_CONNECTIVITY or VALID, but not both. Thus, multiple
validation results allow ConnectivityService to know the real
network status.

Bug: 129662877
Bug: 130683832
Test: atest FrameworksNetTests
Test: atest NetworkStackTests
Test: atest --generate-new-metrics 50
NetworkStackTests:com.android.server.connectivity.NetworkMonitorTest
Test: Simulate partial connectvitiy
Change-Id: I406c9368617c03a2dd3ab15fb1f6dbf539d7c714
2019-05-23 16:29:30 +08:00
Lorenzo Colitti
781db272f3 Properly use versioned interfaces.
Our stable AIDL interfaces need to use versioned build targets,
otherwise getVersion will always return 0, which makes it
impossible to support different components at different versions.

List generated with:
find . -name Android.bp -exec egrep \
    -H "(netd|dnsresolver|ipmemorystore|networkstack).aidl.interface(s?)-(java|cpp)" {} \; \
    | grep -v oemnetd | grep -v tests/

Test: m
Bug: 133124190
(cherry-pick from aosp/968011)
Merged-In: Idf49e840263ef32b9ee4fafa6718d4f893ea7c87
(cherry picked from commit 433f7c4178aaadac7d6a5f6727f39ef83342d436)

Change-Id: I77e2291b52fda24ee01e1b22ddafe4fe7368959e
2019-05-23 07:43:47 +00:00
Chalard Jean
8759c1ec9e Reinstate access to a forgotten member
Followup to aosp/964440

Bug: 131764329
Test: none
Change-Id: I6f6b2cf75793532d3d537a223b8e15d7304a1e3f
2019-05-23 03:32:30 +00:00
Luke Huang
26c1cdb19d Add Rfc6724 style sort for DnsResolver and fix potential bug
1. pass default network explicitly to fix potential
   mis-sync network problem in DnsResolver#query
2. Add rfc6724 sort and related test
3. DnsResolver do rfc6724 sort before response InetAddress answers
4. move haveIpv* function from DnsResolver to DnsUtils

Bug: 129530368
Test: atest DnsResolverTest DnsUtilsTest
Change-Id: I4efa599c0605f6a9e4ef2dd1a36572c69b3c433f
2019-05-23 11:23:41 +08:00
Chenbo Feng
99869f413a Fix the internet permission for native services
The native services should specify their permissions in platform.xml if
they need internet permission, otherwise the eBPF program will block the
socket creation request. Fixing the known services that are in group
AID_INET but didn't specify their permission in the xml file.

Bug: 132217906
Test: CtsJdwpTestCases dumpsys netd trafficcontroller
Change-Id: I84cde7d3757953bc0bf761727d64a715bcdd68bb
2019-05-22 17:59:29 -07:00
Etan Cohen
e5b76ef8b0 Merge "[CM] Fix NPE due to unvalidated callback value" am: 43c1536c6b am: 51ddc176ab
am: 2ab18250bb

Change-Id: I3b0a14e9d6bc002472b8f79ca5004c53869dacec
2019-05-22 14:23:14 -07:00
Chalard Jean
978bc848f1 [automerger skipped] Merge "Update throws documentation for requestNetwork*" into qt-dev am: b95ade4679 -s ours
am: 9efc93467d -s ours
am skip reason: change_id I8b5bb052bf73feed0dfafafaf44fcd07f58186ce with SHA1 31740e4ed3 is in history

Change-Id: I7694ce6bc34b4d53cdb1258f53f2a7ee47721f51
2019-05-22 13:37:10 -07:00
Chalard Jean
b5fcb8b519 [automerger skipped] Let clients access StaticIpConfiguration members through reflection. am: 6f1f2df72b -s ours
am: 1f7ddad460 -s ours
am skip reason: change_id I0fa84390f6c289571afa9d86cb922835fe2b7e77 with SHA1 b4368bed5a is in history

Change-Id: I954be2fc5cff50835997032cfa41d1f56de97096
2019-05-22 13:18:05 -07:00
Chalard Jean
969a790cb8 [automerger skipped] Merge "Update throws documentation for requestNetwork*" into qt-dev am: b95ade4679
am: baa942c751 -s ours
am skip reason: change_id I8b5bb052bf73feed0dfafafaf44fcd07f58186ce with SHA1 31740e4ed3 is in history

Change-Id: Iea0bb85382fb91df093f1acb04d4a33f504c40c9
2019-05-22 11:38:34 -07:00
Chalard Jean
9fe637516d [automerger skipped] Let clients access StaticIpConfiguration members through reflection. am: 6f1f2df72b
am: a331899d92 -s ours
am skip reason: change_id I0fa84390f6c289571afa9d86cb922835fe2b7e77 with SHA1 b4368bed5a is in history

Change-Id: I7205437009d8c7b9e6052b3337df466be020f224
2019-05-22 11:25:56 -07:00
Etan Cohen
2ab18250bb Merge "[CM] Fix NPE due to unvalidated callback value" am: 43c1536c6b
am: 51ddc176ab

Change-Id: Idf439c1f6badd715776eaaced1a781b066ba6d37
2019-05-22 10:44:37 -07:00
Chalard Jean
9efc93467d [automerger skipped] Merge "Update throws documentation for requestNetwork*" into qt-dev
am: b95ade4679 -s ours
am skip reason: change_id I8b5bb052bf73feed0dfafafaf44fcd07f58186ce with SHA1 31740e4ed3 is in history

Change-Id: I315d78170ee356d0fc45e6d4d6d340331133bd03
2019-05-22 09:29:29 -07:00
Chalard Jean
1f7ddad460 [automerger skipped] Let clients access StaticIpConfiguration members through reflection.
am: 6f1f2df72b -s ours
am skip reason: change_id I0fa84390f6c289571afa9d86cb922835fe2b7e77 with SHA1 b4368bed5a is in history

Change-Id: Ic4715dd79bcc6cb98916045f572a3472813b7ac7
2019-05-22 09:14:41 -07:00
Chalard Jean
195b1e86a5 Merge "Update throws documentation for requestNetwork*" am: bfcbf4b450 am: 411f1efc02
am: 884b5f480e

Change-Id: I3e5e35c2bcd84c02bd093c30ac5c184608f798f4
2019-05-22 08:11:27 -07:00
Chalard Jean
31e8e20db4 Merge "Let clients access StaticIpConfiguration members through reflection." am: 65663acf34 am: 892038673e
am: 93f36d6d7e

Change-Id: I77562c577b704a979a9df0125cb63143a47cacb1
2019-05-22 07:57:32 -07:00
Etan Cohen
43c1536c6b Merge "[CM] Fix NPE due to unvalidated callback value" 2019-05-22 13:53:31 +00:00
Chalard Jean
b95ade4679 Merge "Update throws documentation for requestNetwork*" into qt-dev 2019-05-22 13:42:29 +00:00
Lorenzo Colitti
95c5c024c0 Merge "Merge "Properly use versioned interfaces." am: 9572afce76 am: b92fbe0435" into qt-dev-plus-aosp
am: 5b992330bb

Change-Id: I45ae2c177daf99474bf8232aa4379521b363bd1b
2019-05-22 06:24:56 -07:00
Chalard Jean
8ad1afb8f8 Update throws documentation for requestNetwork*
Bug: 78126688
Test: builds
Change-Id: Iaabcc52b3e6537752990b88a24e11217f73ce8e7
(cherry picked from commit 75f1329f927202f39ae29d2acaad97d01f5c8cb8)
Merged-In: I8b5bb052bf73feed0dfafafaf44fcd07f58186ce
2019-05-22 12:02:51 +00:00
Chalard Jean
6f1f2df72b Let clients access StaticIpConfiguration members through reflection.
Bug: 131764329
Test: none
Change-Id: Ice5c4fd4d469a55410129310c5a25874b94e2219
(cherry picked from commit 6736fb0465e3cc9f38ee1340e6b831a6dcd195e8)
Merged-In: I0fa84390f6c289571afa9d86cb922835fe2b7e77
2019-05-22 12:01:31 +00:00
Chalard Jean
884b5f480e Merge "Update throws documentation for requestNetwork*" am: bfcbf4b450
am: 411f1efc02

Change-Id: Iaabcc52b3e6537752990b88a24e11217f73ce8e7
2019-05-22 02:55:10 -07:00
Chalard Jean
93f36d6d7e Merge "Let clients access StaticIpConfiguration members through reflection." am: 65663acf34
am: 892038673e

Change-Id: Ice5c4fd4d469a55410129310c5a25874b94e2219
2019-05-22 02:42:25 -07:00
Chalard Jean
bfcbf4b450 Merge "Update throws documentation for requestNetwork*" 2019-05-22 08:34:43 +00:00
Lorenzo Colitti
91ddb23d66 Merge "Properly use versioned interfaces." am: 9572afce76
am: b92fbe0435

Change-Id: Idf49e840263ef32b9ee4fafa6718d4f893ea7c87
2019-05-22 01:20:45 -07:00
Chalard Jean
65663acf34 Merge "Let clients access StaticIpConfiguration members through reflection." 2019-05-22 07:17:52 +00:00
Etan Cohen
b58e366f2d [CM] Fix NPE due to unvalidated callback value
When unregistering callback due to ON_UNAVAILABLE did not check for
a non-null callback.

Bug: 132950880
Test: atest ConnectivityServiceTest
Change-Id: I8f3322963f322e6690f1403681bf66e8b38b35f8
2019-05-22 04:56:09 +00:00
Lorenzo Colitti
4b56771878 Properly use versioned interfaces.
Our stable AIDL interfaces need to use versioned build targets,
otherwise getVersion will always return 0, which makes it
impossible to support different components at different versions.

List generated with:
find . -name Android.bp -exec egrep \
    -H "(netd|dnsresolver|ipmemorystore|networkstack).aidl.interface(s?)-(java|cpp)" {} \;

Bug: 133124190
Test: m
Change-Id: Id175c99daa77507847673777a8dcce51897ab17b
2019-05-22 03:12:59 +00:00
junyulai
fea03925fd Merge "Move keepalive constants to their right place" am: ac6f142334 am: 292f73b0dc
am: 0121a21ff7

Change-Id: I4dcbf65c8b778815eef748ee348c928a258d40e0
2019-05-20 22:57:54 -07:00
junyulai
0121a21ff7 Merge "Move keepalive constants to their right place" am: ac6f142334
am: 292f73b0dc

Change-Id: Id45981af5b42ec1423aff8b0ec1bc07d7c71c6b9
2019-05-20 22:09:19 -07:00
Treehugger Robot
ac6f142334 Merge "Move keepalive constants to their right place" 2019-05-21 02:01:30 +00:00
junyulai
654be392b6 Move keepalive constants to their right place
The constants CMD_{ADD,REMOVE}_KEEPALIVE_PACKET_FILTER are too
high in the file and not in order. These constants should be
moved back to their rightful place.

Bug: 123987395
Test: 1. m -j 2. m -j doc-comment-check-docs
Change-Id: I44c827d3a2011cf7c66c0444566e14192fec1b1b
2019-05-21 00:23:41 +00:00
Chalard Jean
b4368bed5a Let clients access StaticIpConfiguration members through reflection.
Bug: 131764329
Test: none
Change-Id: I0fa84390f6c289571afa9d86cb922835fe2b7e77
2019-05-20 16:58:08 +09:00
Remi NGUYEN VAN
779642197d [automerger skipped] Merge "Reland: Add FrameworksNetTests dependency on libcgrouprc" am: 909e72a9e4 am: e8ceef0220 -s ours
am: d10d49aa4d -s ours
am skip reason: change_id If9c8aa41c4e96a79b71c88f199a4f3b0483e31cd with SHA1 5e44e5fafc is in history

Change-Id: I9eff349b9d879aa84d8bb096ec895a749e138ca8
2019-05-17 08:12:01 -07:00
Remi NGUYEN VAN
d10d49aa4d [automerger skipped] Merge "Reland: Add FrameworksNetTests dependency on libcgrouprc" am: 909e72a9e4
am: e8ceef0220 -s ours
am skip reason: change_id If9c8aa41c4e96a79b71c88f199a4f3b0483e31cd with SHA1 5e44e5fafc is in history

Change-Id: Ia14d1971aaed3d2badf5d9c037133e8a12e16bfa
2019-05-17 08:00:52 -07:00
Android Build Merger (Role)
d3c11c7454 Merge "[automerger skipped] Merge "Change the icon for the LOGGED_IN notification." into qt-dev am: 38254b8bd7 am: c0b843372b -s ours am skip reason: change_id I8250236bc4ba251492a6cb9bf23e67666ef860d3 with SHA1 b45f7ad98b is in history" into qt-r1-dev-plus-aosp 2019-05-17 14:26:33 +00:00
Lorenzo Colitti
8a610f44dd [automerger skipped] Merge "Change the icon for the LOGGED_IN notification." into qt-dev am: 38254b8bd7 -s ours
am: 7f7ad61c24 -s ours
am skip reason: change_id I8250236bc4ba251492a6cb9bf23e67666ef860d3 with SHA1 b45f7ad98b is in history

Change-Id: I26f49751773bc8bc0d728f73c9fed6b1eda6dbb8
2019-05-17 07:25:57 -07:00
Lorenzo Colitti
f1dc853c0e [automerger skipped] Merge "Change the icon for the LOGGED_IN notification." into qt-dev am: 38254b8bd7
am: c0b843372b -s ours
am skip reason: change_id I8250236bc4ba251492a6cb9bf23e67666ef860d3 with SHA1 b45f7ad98b is in history

Change-Id: I6951c41b9dd1ad2c457e017a6d0e1dac0c23b604
2019-05-17 07:25:57 -07:00
Lorenzo Colitti
7f7ad61c24 [automerger skipped] Merge "Change the icon for the LOGGED_IN notification." into qt-dev
am: 38254b8bd7 -s ours
am skip reason: change_id I8250236bc4ba251492a6cb9bf23e67666ef860d3 with SHA1 b45f7ad98b is in history

Change-Id: I0ff820347cd8aa5e66150717d3406d6af5f749f7
2019-05-17 07:14:29 -07:00
Lorenzo Colitti
38254b8bd7 Merge "Change the icon for the LOGGED_IN notification." into qt-dev 2019-05-17 13:58:09 +00:00
Paul Hu
9c4b812c01 [automerger skipped] Merge "Ignore NetworkTest when running CtsNetTestCases in instant app mode" into qt-dev am: b725fc0059 -s ours
am: 361b17feba -s ours
am skip reason: change_id Ia28eea113e19b9c44998677e5b8093be178a06a3 with SHA1 bea628fb59 is in history

Change-Id: I98d262a12283319c32f14e03ac6b7c8ae7ee9096
2019-05-17 01:56:53 -07:00
Lorenzo Colitti
d663a3ba0a Merge "Change the icon for the LOGGED_IN notification." am: 2c3f94e392 am: fce3635550
am: c67e20d59c

Change-Id: I529ac4a707cdd9696186991a4f34cf5eaf26c8d8
2019-05-17 01:38:24 -07:00
Paul Hu
061a8ddb77 [automerger skipped] Merge "Ignore NetworkTest when running CtsNetTestCases in instant app mode" into qt-dev am: b725fc0059
am: b200928ed4 -s ours
am skip reason: change_id Ia28eea113e19b9c44998677e5b8093be178a06a3 with SHA1 bea628fb59 is in history

Change-Id: I4546fd5f500f7438f2efaaad95a67a5f01bc068d
2019-05-17 01:11:43 -07:00
Ian Kasprzak
db10850966 Reland: Add FrameworksNetTests dependency on libcgrouprc
Original CL description:
Add FrameworksNetTests dependency on libcgrouprc

The tests are currently broken without this dependency.

Bug: 132925169
Test: atest FrameworksNetTests
Change-Id: I473b250587d871158e1e9595d56183a0342238d8
Merged-In: If9c8aa41c4e96a79b71c88f199a4f3b0483e31cd
2019-05-17 17:11:16 +09:00
Paul Hu
361b17feba [automerger skipped] Merge "Ignore NetworkTest when running CtsNetTestCases in instant app mode" into qt-dev
am: b725fc0059 -s ours
am skip reason: change_id Ia28eea113e19b9c44998677e5b8093be178a06a3 with SHA1 bea628fb59 is in history

Change-Id: I1374882f23cc9676fff5562a35f1057f49f74040
2019-05-17 01:10:25 -07:00
Lorenzo Colitti
c67e20d59c Merge "Change the icon for the LOGGED_IN notification." am: 2c3f94e392
am: fce3635550

Change-Id: I9013d2d147979ffc03bc0da6b9a503f8ce623b70
2019-05-17 00:41:51 -07:00
Paul Hu
b725fc0059 Merge "Ignore NetworkTest when running CtsNetTestCases in instant app mode" into qt-dev 2019-05-17 06:46:36 +00:00
Lorenzo Colitti
ee5282105c Change the icon for the LOGGED_IN notification.
This notification is shown when the user has already logged in to
the network, so it should not have a question mark on it.

Fix: 130526201
Test: atest FrameworksNetTests
Test: manually signed in to portal
Change-Id: I8250236bc4ba251492a6cb9bf23e67666ef860d3
Merged-In: I8250236bc4ba251492a6cb9bf23e67666ef860d3
(cherry picked from commit fce363555029b92b1532058555797d6ef1afb09c)
2019-05-17 06:25:09 +00:00