Commit Graph

7026 Commits

Author SHA1 Message Date
Chenbo Feng
d917ae5dc9 [automerger skipped] Merge "Fix the internet permission for native services" into qt-dev am: 2e17b24023 am: f68f9d9f36 -s ours
am: 073dcff305 -s ours
am skip reason: change_id I84cde7d3757953bc0bf761727d64a715bcdd68bb with SHA1 99869f413a is in history

Change-Id: I2e5c8a3bd6266d178c98cc77359dccfa9043024d
2019-05-24 17:48:13 -07:00
Chenbo Feng
e5d445afee Merge "Fix the internet permission for native services" am: dcc6ebb96f am: 5d4822bcd2 am: d053460495
am: 8b9a2f571b

Change-Id: I0a16f0e31605fb4fe52b1fe7478e4a203ffd7c6b
2019-05-24 17:22:44 -07:00
Etan Cohen
c1c36d04f8 [automerger skipped] Merge changes from topic "on_unavailable_fix" into qt-dev am: 285b665784 am: 9c1c1c03ff -s ours
am: 1dc7494bbb -s ours
am skip reason: change_id Ia2cc04b42288ea987483e5ab0e0a10093dc49502 with SHA1 cc65a628eb is in history

Change-Id: Ia9ba7d96b94e5cab416663149b168cd0734409fa
2019-05-24 17:21:35 -07:00
Etan Cohen
86e70fb5be Merge "[CM] Fix NPE due to unvalidated callback value" am: 62790fbdfe am: cc65a628eb am: a255662062
am: 566a97bc7a

Change-Id: Ic8c5ce53747c4201bc76d169c0c6b21fd55007a7
2019-05-24 12:12:29 -07:00
Luke Huang
23e0e7269f Merge "Add Rfc6724 style sort for DnsResolver and fix potential bug" am: 7a1133eb44 am: d352f4ca85 am: 387e63d68b
am: e9d9026ec2

Change-Id: I4edd8083cc9775c745d3f24d8bfc7184f7f6a70a
2019-05-24 11:09:16 -07:00
Remi NGUYEN VAN
e741cb778f [automerger skipped] Merge "Properly use versioned interfaces." into qt-dev am: efc774b76c -s ours am: be092469ac -s ours
am: 671a0df6d6 -s ours
am skip reason: change_id Idf49e840263ef32b9ee4fafa6718d4f893ea7c87 with SHA1 91ddb23d66 is in history

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

Change-Id: Iffdde8d9465ac6b0526127f96380210618ae459a
2019-05-24 07:12:42 -07:00
Etan Cohen
7a66717d89 [CM] Fix NPE due to unvalidated callback value
Fix flaky test resulting from the above fix.

Bug: 132950880
Fix: 133457081
Test: atest ConnectivityServiceTest
Merged-In: Ia2cc04b42288ea987483e5ab0e0a10093dc49502
Change-Id: Ia2cc04b42288ea987483e5ab0e0a10093dc49502
(cherry picked from commit c8289e40a4)
2019-05-24 09:19:06 +00:00
Chenbo Feng
073dcff305 [automerger skipped] Merge "Fix the internet permission for native services" into qt-dev am: 2e17b24023
am: f68f9d9f36 -s ours
am skip reason: change_id I84cde7d3757953bc0bf761727d64a715bcdd68bb with SHA1 99869f413a is in history

Change-Id: Ie09912db7602806b34700fb6553334413f9aafc0
2019-05-23 22:15:34 -07:00
TreeHugger Robot
2e17b24023 Merge "Fix the internet permission for native services" into qt-dev 2019-05-24 01:18:19 +00:00
Chenbo Feng
8b9a2f571b Merge "Fix the internet permission for native services" am: dcc6ebb96f am: 5d4822bcd2
am: d053460495

Change-Id: I7f22aafe3b35f24e68fff85723aaceb4a0444af5
2019-05-23 17:22:39 -07:00
Etan Cohen
1dc7494bbb [automerger skipped] Merge changes from topic "on_unavailable_fix" into qt-dev am: 285b665784
am: 9c1c1c03ff -s ours
am skip reason: change_id Ia2cc04b42288ea987483e5ab0e0a10093dc49502 with SHA1 cc65a628eb is in history

Change-Id: I356601b3d10f4b3fdbe7fcf3e46762715a7cc86a
2019-05-23 16:14:59 -07:00
Chenbo Feng
d053460495 Merge "Fix the internet permission for native services" am: dcc6ebb96f
am: 5d4822bcd2

Change-Id: I795bc87ad6cba7c40974136ca3b122540679c684
2019-05-23 13:51:43 -07:00
Etan Cohen
d905f7f74a Merge "[CM] Fix NPE due to unvalidated callback value" am: 43c1536c6b am: 51ddc176ab am: 2ab18250bb
am: e5b76ef8b0

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

Change-Id: I4b7aa24913ce78d410737b63548d28ccd7ae54e8
2019-05-23 12:06:45 -07:00
Chalard Jean
9772a8e1ee [automerger skipped] Let clients access StaticIpConfiguration members through reflection. am: 6f1f2df72b -s ours am: 1f7ddad460 -s ours
am: b5fcb8b519 -s ours
am skip reason: change_id I0fa84390f6c289571afa9d86cb922835fe2b7e77 with SHA1 b4368bed5a is in history

Change-Id: I332158c5a3f57eff31023bf9116e265731cea7d3
2019-05-23 11:58:23 -07:00
Chenbo Feng
158ac5a39e 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
Merged-In: I84cde7d3757953bc0bf761727d64a715bcdd68bb
(cherry picked from commit e5d6f0fa6c3fd77572f5b29f416acbf304abf9da)
2019-05-23 11:54:49 -07:00
Treehugger Robot
dcc6ebb96f Merge "Fix the internet permission for native services" 2019-05-23 18:40:42 +00:00
Chalard Jean
40d5e6d551 [automerger skipped] Merge "Update throws documentation for requestNetwork*" into qt-dev am: b95ade4679 am: baa942c751 -s ours
am: 969a790cb8 -s ours
am skip reason: change_id I8b5bb052bf73feed0dfafafaf44fcd07f58186ce with SHA1 31740e4ed3 is in history

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

Change-Id: I1c8e0e617f1c4c02970fc349d6adad2089c869da
2019-05-23 11:20:55 -07:00
Etan Cohen
566a97bc7a Merge "[CM] Fix NPE due to unvalidated callback value" am: 62790fbdfe am: cc65a628eb
am: a255662062

Change-Id: Iecfa40fe34c2054d58a9e8239b855c1a831764c0
2019-05-23 10:31:44 -07:00
Chalard Jean
a93d51b0ca Merge "Update throws documentation for requestNetwork*" am: bfcbf4b450 am: 411f1efc02 am: 884b5f480e
am: 195b1e86a5

Change-Id: I601fcfc94071dd57c867af11087698784fab94f5
2019-05-23 10:27:15 -07:00
Chalard Jean
fb5cf9644f Merge "Let clients access StaticIpConfiguration members through reflection." am: 65663acf34 am: 892038673e am: 93f36d6d7e
am: 31e8e20db4

Change-Id: I88b0235ff4ccb0091b0a1d11aa109fc631d5a063
2019-05-23 10:10:13 -07:00
Etan Cohen
a255662062 Merge "[CM] Fix NPE due to unvalidated callback value" am: 62790fbdfe
am: cc65a628eb

Change-Id: I5a6e2e92852f76251e8c1bfcd3c06c6773ec1fe4
2019-05-23 09:42:00 -07:00
Etan Cohen
c8289e40a4 [CM] Fix NPE due to unvalidated callback value
Fix flaky test resulting from the above fix.

Bug: 132950880
Test: atest ConnectivityServiceTest
Merged-In: Ia2cc04b42288ea987483e5ab0e0a10093dc49502
Change-Id: Ia2cc04b42288ea987483e5ab0e0a10093dc49502
(cherry picked from commit cc65a628eb1172dc7b942d7f51b702099c15c23b)
2019-05-23 16:23:13 +00:00
Etan Cohen
0da57a8b67 [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
Merged-In: Ib3fde31d88c36469cdee1e3578606d130a9817cb
Change-Id: Ib3fde31d88c36469cdee1e3578606d130a9817cb
(cherry picked from commit 51ddc176abd23bd3ddbc26124e5541a983a1db07)
2019-05-23 16:20:15 +00:00
Etan Cohen
62790fbdfe Merge "[CM] Fix NPE due to unvalidated callback value" 2019-05-23 16:01:51 +00:00
Luke Huang
e9d9026ec2 Merge "Add Rfc6724 style sort for DnsResolver and fix potential bug" am: 7a1133eb44 am: d352f4ca85
am: 387e63d68b

Change-Id: I913b31586d15c24d1535e8d7cd0b158c25892286
2019-05-23 08:55:06 -07:00
Etan Cohen
1f1bcb0b68 [CM] Fix NPE due to unvalidated callback value
Fix flaky test resulting from the above fix.

Bug: 132950880
Test: atest ConnectivityServiceTest
Change-Id: I1ddf3bb016239bf88cdd8843a71dcb5e582e83ac
2019-05-23 08:16:20 -07:00
Remi NGUYEN VAN
671a0df6d6 [automerger skipped] Merge "Properly use versioned interfaces." into qt-dev am: efc774b76c -s ours
am: be092469ac -s ours
am skip reason: change_id Idf49e840263ef32b9ee4fafa6718d4f893ea7c87 with SHA1 91ddb23d66 is in history

Change-Id: I6b541348f904d737cc79fb1b6e1c1bbc54b5e184
2019-05-23 07:35:00 -07:00
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
Lorenzo Colitti
7e0b85ae5c Merge "Merge "Merge "Properly use versioned interfaces." am: 9572afce76 am: b92fbe0435" into qt-dev-plus-aosp am: 5b992330bb" into qt-r1-dev-plus-aosp
am: b010e1210b

Change-Id: Id816e44f87d644e2c8b0e41b860fac7fd4305fed
2019-05-23 03:48:36 -07: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
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