Commit Graph

8650 Commits

Author SHA1 Message Date
Chiachang Wang
cd41d6e7b6 Merge "Clean up for multiple validation result update" am: 7a5b9c2d0a am: 0d018cdaec am: 9ec2c725c8
am: 807fa67f75

Change-Id: I9087ef791b3fee5399ba8e83ef9d8a544845a4dd
2019-05-25 08:42:17 -07:00
Chiachang Wang
807fa67f75 Merge "Clean up for multiple validation result update" am: 7a5b9c2d0a am: 0d018cdaec
am: 9ec2c725c8

Change-Id: Ia9dc0f944d6f7aa146124b6899832e27cd530950
2019-05-25 03:09:42 -07:00
Chiachang Wang
9ec2c725c8 Merge "Clean up for multiple validation result update" am: 7a5b9c2d0a
am: 0d018cdaec

Change-Id: I4424663292c5ad29eb7a888fa6975835721a5d2e
2019-05-25 02:53:44 -07:00
Chiachang Wang
499630e2af Merge "[automerger skipped] Merge "Update multiple validation result to ConnectivityService" into qt-dev am: 399b7500af -s ours am: fcf0ced706 -s ours
am: e188af49a9 -s ours
am skip reason: change_id I243db4c406cca826e803c8035268bc0c6e6e01e2 with SHA1 2c593ec776 is in history

Change-Id: I1576f42c89041bd6f3bea1ff37a4141333dc9bb5
2019-05-24 23:11:42 -07:00
Chiachang Wang
7634b7b7c9 [automerger skipped] Merge "Update multiple validation result to ConnectivityService" into qt-dev am: 399b7500af am: ff9340a1b0 -s ours
am: 7b5d4c2fae -s ours
am skip reason: change_id I243db4c406cca826e803c8035268bc0c6e6e01e2 with SHA1 2c593ec776 is in history

Change-Id: Ia4aab74014d166e1145e2c65b5018b0ace47c3fd
2019-05-24 23:09:34 -07:00
Android Build Merger (Role)
e188af49a9 Merge "[automerger skipped] Merge "Update multiple validation result to ConnectivityService" into qt-dev am: 399b7500af -s ours am: fcf0ced706 -s ours am skip reason: change_id I243db4c406cca826e803c8035268bc0c6e6e01e2 with SHA1 2c593ec776 is in history" into qt-r1-dev-plus-aosp 2019-05-25 05:38:36 +00:00
Chiachang Wang
85885358e2 [automerger skipped] Merge "Update multiple validation result to ConnectivityService" into qt-dev am: 399b7500af -s ours
am: fcf0ced706 -s ours
am skip reason: change_id I243db4c406cca826e803c8035268bc0c6e6e01e2 with SHA1 2c593ec776 is in history

Change-Id: I5ddb5d0d856960d226d41ca561d665be1accd4d2
2019-05-24 22:37:54 -07:00
Chiachang Wang
7b5d4c2fae [automerger skipped] Merge "Update multiple validation result to ConnectivityService" into qt-dev am: 399b7500af
am: ff9340a1b0 -s ours
am skip reason: change_id I243db4c406cca826e803c8035268bc0c6e6e01e2 with SHA1 2c593ec776 is in history

Change-Id: Ic0b0150bb5c5ddcaeff17b27f454d96b795892ca
2019-05-24 22:34:22 -07:00
Chiachang Wang
fcf0ced706 [automerger skipped] Merge "Update multiple validation result to ConnectivityService" into qt-dev
am: 399b7500af -s ours
am skip reason: change_id I243db4c406cca826e803c8035268bc0c6e6e01e2 with SHA1 2c593ec776 is in history

Change-Id: I09ce684da6680c5c20de4e3f0a7cf741f85131ec
2019-05-24 22:01:20 -07:00
Chiachang Wang
fab45b825b Merge "Update multiple validation result to ConnectivityService" am: 5af07137d7 am: a0e9af113c am: 2c593ec776
am: 0a10069a9a

Change-Id: I30037422737750078de3ec6c93c7ee953440f73f
2019-05-24 18:22:37 -07:00
Chenbo Feng
811e90ece8 [automerger skipped] Merge "Fix the internet permission for native services" into qt-dev am: 2e17b24023 -s ours am: 6e300a80fb -s ours
am: 6879cc6bc1 -s ours
am skip reason: change_id I84cde7d3757953bc0bf761727d64a715bcdd68bb with SHA1 158ac5a39e is in history

Change-Id: Ied672c64c5dfba005b51485013bf8d3892cca485
2019-05-24 18:20:31 -07:00
Etan Cohen
c3be83c399 [automerger skipped] Merge changes from topic "on_unavailable_fix" into qt-dev am: 285b665784 -s ours am: d954300cb5 -s ours
am: 37eb1e4f65 -s ours
am skip reason: change_id Ia2cc04b42288ea987483e5ab0e0a10093dc49502 with SHA1 c8289e40a4 is in history

Change-Id: I85bfb02cecefcbe771d2e09e148a0a97acba75f7
2019-05-24 17:51:13 -07:00
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
Chiachang Wang
0a10069a9a Merge "Update multiple validation result to ConnectivityService" am: 5af07137d7 am: a0e9af113c
am: 2c593ec776

Change-Id: I3bb06a758571bc1dcf2ccf683db391c742f7a5b5
2019-05-24 01:50:11 -07:00
Chenbo Feng
6879cc6bc1 [automerger skipped] Merge "Fix the internet permission for native services" into qt-dev am: 2e17b24023 -s ours
am: 6e300a80fb -s ours
am skip reason: change_id I84cde7d3757953bc0bf761727d64a715bcdd68bb with SHA1 99869f413a is in history

Change-Id: I810ad402c4bef38fe1f2c7dcb0e0ab543d81b69b
2019-05-24 01:32:47 -07:00
Etan Cohen
37eb1e4f65 [automerger skipped] Merge changes from topic "on_unavailable_fix" into qt-dev am: 285b665784 -s ours
am: d954300cb5 -s ours
am skip reason: change_id Ia2cc04b42288ea987483e5ab0e0a10093dc49502 with SHA1 c8289e40a4 is in history

Change-Id: I304be543fe4f0323804da4da0b4b68c63942a264
2019-05-23 23:22:31 -07:00
Chiachang Wang
dc07f26256 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
Merged-In: I243db4c406cca826e803c8035268bc0c6e6e01e2
(cherry picked from commit 4532abd4d2af9ad118873a63cafc6028ed87c52e)
2019-05-24 06:15:25 +00:00
Chiachang Wang
2c593ec776 Merge "Update multiple validation result to ConnectivityService" am: 5af07137d7
am: a0e9af113c

Change-Id: I243db4c406cca826e803c8035268bc0c6e6e01e2
2019-05-23 22:57:18 -07: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
Chiachang Wang
b8d3727aa1 Clean up for multiple validation result update
This is a follow-up commit for aosp/955431 to update commets
and minor updates in unit test.

Test: atest com.android.server.ConnectivityServiceTest#testCaptivePortalOnPartialConnectivity
Bug: 130683832
Change-Id: I581eae8daeddd2c4c186e7b40e27fef2aaa7ab43
2019-05-24 03:29:56 +00:00
Chenbo Feng
6e300a80fb [automerger skipped] Merge "Fix the internet permission for native services" into qt-dev
am: 2e17b24023 -s ours
am skip reason: change_id I84cde7d3757953bc0bf761727d64a715bcdd68bb with SHA1 99869f413a is in history

Change-Id: I5cdb1fd2821c1cee229ca541c8ab02da66d9f474
2019-05-23 20:14:37 -07:00
Chiachang Wang
5af07137d7 Merge "Update multiple validation result to ConnectivityService" 2019-05-24 02:50:54 +00:00
Etan Cohen
d954300cb5 [automerger skipped] Merge changes from topic "on_unavailable_fix" into qt-dev
am: 285b665784 -s ours
am skip reason: change_id Ia2cc04b42288ea987483e5ab0e0a10093dc49502 with SHA1 cc65a628eb is in history

Change-Id: Iddb2d6487a118102eeeedd03c876cd4ec137427e
2019-05-23 18:23:32 -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