Commit Graph

6893 Commits

Author SHA1 Message Date
Xiao Ma
f89321142a [automerger skipped] Merge "Wipe the data in IpMemoryStore database upon network factory reset." into qt-dev
am: c6fa83b20f -s ours
am skip reason: change_id I13ad04454e638905b74dd42a1c83266c7c37652f with SHA1 2cdcca0432 is in history

Change-Id: I3cf152c683a9c09245b05341973e31bd1715668f
2019-05-28 03:48:49 -07:00
TreeHugger Robot
c6fa83b20f Merge "Wipe the data in IpMemoryStore database upon network factory reset." into qt-dev 2019-05-28 10:31:21 +00:00
Chiachang Wang
a0c8cf09f1 [automerger skipped] Merge "Clean up for multiple validation result update" into qt-dev
am: c4e5d81ad0 -s ours
am skip reason: change_id I4424663292c5ad29eb7a888fa6975835721a5d2e with SHA1 10ccb3c19f is in history

Change-Id: I37cc75afcf4c2cfbe86fb5a165073d94e98c6e6d
2019-05-28 02:58:39 -07:00
Chalard Jean
62633f914a [automerger skipped] Merge "Reinstate access to a forgotten member" into qt-dev
am: 6f47d2fc65 -s ours
am skip reason: change_id I6f6b2cf75793532d3d537a223b8e15d7304a1e3f with SHA1 84a903765a is in history

Change-Id: Id859f70e1e7584d3640a43a041126b82b308d84e
2019-05-28 02:50:36 -07:00
Chiachang Wang
c4e5d81ad0 Merge "Clean up for multiple validation result update" into qt-dev 2019-05-28 09:44:47 +00:00
Chalard Jean
6f47d2fc65 Merge "Reinstate access to a forgotten member" into qt-dev 2019-05-28 09:38:51 +00:00
Xiao Ma
e35e544614 Wipe the data in IpMemoryStore database upon network factory reset.
Bug:128499160
Test: manual
Test: atest FrameworksNetTests NetworkStackTests
Merged-In: I13ad04454e638905b74dd42a1c83266c7c37652f
Merged-In: Ia13ff10a57c2043f6676976f23ecfb2d2a9a6ef0
(cherry picked from commit ef6ef68c48b869aa9960edd81c73f3d31391ae26)

Change-Id: I42507451d55a620c0e2d271c895ad158f348c1a5
2019-05-28 08:46:44 +00:00
Luke Huang
0934793a73 Merge changes from topic "am-851f19c8d7d34bb48accd48868aae501-qt-dev" into qt-dev
am: e6e925ff64

Change-Id: I8cd6013a4312d945936a38026285b2e33f6c7c49
2019-05-27 22:52:59 -07:00
Luke Huang
1b928e2789 [automerger skipped] Add Rfc6724 style sort for DnsResolver and fix potential bug
am: ccb076662c -s ours
am skip reason: change_id I0323f5c7f32fc3fa589b9e87f8e7c9caf744dbd4 with SHA1 d352f4ca85 is in history

Change-Id: Ie4e69c27646febd06df2b93361f431dbd51bde4f
2019-05-27 22:52:47 -07:00
Luke Huang
e6e925ff64 Merge changes from topic "am-851f19c8d7d34bb48accd48868aae501-qt-dev" into qt-dev
* changes:
  Remove broken test testRfc6724Sort
  Add Rfc6724 style sort for DnsResolver and fix potential bug
2019-05-28 05:38:49 +00:00
Luke Huang
9b6e5dafcd Remove broken test testRfc6724Sort
This test is conitnuely fail in cuttlefish.
Lack of ipv6 default route in cuttlefish caused the test failed.
The reason is that the result of rfc6724Sort depends on on the route in system.
It is not good to expect any route should exists, so remove it.

Bug: 133649648
Test: atest DnsUtilsTest

Merged-In: Idc6db433585de067e45088b43665c8e37b310397
(cherry picked from commit 91b35f88429d77ddce0e3f539690e6370b89915b)

Change-Id: Idb6f4c094d3466772e3bfc98a57505bf38f381ef
2019-05-28 03:24:14 +00:00
Xiao Ma
2cdcca0432 Merge "Wipe the data in IpMemoryStore database upon network factory reset." am: 7aaf1b6710
am: 0b9f498f86

Change-Id: I13ad04454e638905b74dd42a1c83266c7c37652f
2019-05-27 18:12:49 -07:00
Xiao Ma
7aaf1b6710 Merge "Wipe the data in IpMemoryStore database upon network factory reset." 2019-05-28 00:52:00 +00:00
Luke Huang
4cf2b57865 Merge "Remove broken test testRfc6724Sort" am: 9ef204da1c
am: 79e97b7d21

Change-Id: I37aa8acc6beeb1e20b99098b1f9e8d5ef800c4eb
2019-05-27 07:33:33 -07:00
Luke Huang
9ef204da1c Merge "Remove broken test testRfc6724Sort" 2019-05-27 14:12:05 +00:00
Chalard Jean
5aaaa8bd6f Reinstate access to a forgotten member
Followup to aosp/964440

Bug: 131764329
Test: none
Merged-In: I6f6b2cf75793532d3d537a223b8e15d7304a1e3f
Change-Id: Ib279c0076016c53e0491fc0df8cefff8ae280d66
(cherry picked from commit 41bd3c57b4ba347ac6eb4546855daf5473264a29)
2019-05-27 12:21:15 +00:00
Chalard Jean
28bdd1e6bf Merge "Reinstate access to a forgotten member" am: 3c2830e739
am: 2f4bd91b99

Change-Id: Ib279c0076016c53e0491fc0df8cefff8ae280d66
2019-05-27 04:33:13 -07:00
Treehugger Robot
3c2830e739 Merge "Reinstate access to a forgotten member" 2019-05-27 11:14:37 +00:00
Luke Huang
686f558f38 Remove broken test testRfc6724Sort
This test is conitnuely fail in cuttlefish.
Lack of ipv6 default route in cuttlefish caused the test failed.
The reason is that the result of rfc6724Sort depends on on the route in system.
It is not good to expect any route should exists, so remove it.

Bug: 133649648
Test: atest DnsUtilsTest
Change-Id: I91f89782b9b989fa1a49e666bb5ce2df3a0dbbf7
2019-05-27 17:49:32 +08:00
Xiao Ma
5141006a28 Wipe the data in IpMemoryStore database upon network factory reset.
Bug:128499160
Test: manual
Test: atest FrameworksNetTests NetworkStackTests
Change-Id: Ib563463a861a5d27b1e9b5fbb92342249b573802
2019-05-27 15:05:09 +09:00
Chiachang Wang
2a8695a2dd 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
Merged-In: I9087ef791b3fee5399ba8e83ef9d8a544845a4dd
Merged-In: I4424663292c5ad29eb7a888fa6975835721a5d2e
(cherry picked from commit 3d3a9fff7b7fa0df4ee627cb082668e642d6f754)
2019-05-27 00:54:53 +00:00
Chiachang Wang
10ccb3c19f 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
04b84603bf [automerger skipped] Merge "Update multiple validation result to ConnectivityService" into qt-dev
am: 399b7500af -s ours
am skip reason: change_id I243db4c406cca826e803c8035268bc0c6e6e01e2 with SHA1 adb166e018 is in history

Change-Id: I09ce684da6680c5c20de4e3f0a7cf741f85131ec
2019-05-24 22:01:20 -07:00
Chiachang Wang
75387c9ced 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
adb166e018 Merge "Update multiple validation result to ConnectivityService" am: 7eff27b409
am: a0e9af113c

Change-Id: I243db4c406cca826e803c8035268bc0c6e6e01e2
2019-05-23 22:57:18 -07:00
Chiachang Wang
59d7d2957f 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
b98ed58156 [automerger skipped] Merge "Fix the internet permission for native services" into qt-dev
am: 70d6101acf -s ours
am skip reason: change_id I84cde7d3757953bc0bf761727d64a715bcdd68bb with SHA1 1da500ec4f is in history

Change-Id: I5cdb1fd2821c1cee229ca541c8ab02da66d9f474
2019-05-23 20:14:37 -07:00
Chiachang Wang
7eff27b409 Merge "Update multiple validation result to ConnectivityService" 2019-05-24 02:50:54 +00:00
Etan Cohen
0d7ae0c67a [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
70d6101acf Merge "Fix the internet permission for native services" into qt-dev 2019-05-24 01:18:19 +00:00
Chenbo Feng
5d38508a84 Merge "Fix the internet permission for native services" am: 571717b7d3
am: 5d4822bcd2

Change-Id: I795bc87ad6cba7c40974136ca3b122540679c684
2019-05-23 13:51:43 -07:00
Chenbo Feng
8687578d58 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
571717b7d3 Merge "Fix the internet permission for native services" 2019-05-23 18:40:42 +00:00
Etan Cohen
e004325c7e Merge "[CM] Fix NPE due to unvalidated callback value" am: 96d3d20f43
am: cc65a628eb

Change-Id: I5a6e2e92852f76251e8c1bfcd3c06c6773ec1fe4
2019-05-23 09:42:00 -07:00
Etan Cohen
3f8c6019f3 [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
3ad9eba8ad [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
96d3d20f43 Merge "[CM] Fix NPE due to unvalidated callback value" 2019-05-23 16:01:51 +00:00
Etan Cohen
bcf0006ff7 [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
Luke Huang
ccb076662c 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

Merged-In: I0323f5c7f32fc3fa589b9e87f8e7c9caf744dbd4
(cherry picked from commit d352f4ca85ff8418a5a58d32fb03b85d7e0b843b)

Change-Id: I98455045fa43cc5a5902a08232251c1734feaac3
2019-05-23 14:36:21 +00:00
Luke Huang
49d8c42782 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
52703acf3c [automerger skipped] Merge "Properly use versioned interfaces." into qt-dev
am: efc774b76c -s ours
am skip reason: change_id Idf49e840263ef32b9ee4fafa6718d4f893ea7c87 with SHA1 d313b755ab is in history

Change-Id: I43fe257d42daf3c948bae8a669f19527b99cfab8
2019-05-23 06:02:00 -07:00
Chiachang Wang
9cfa6fe703 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
8dd631568b 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
84a903765a 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
f9a84cd530 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
1da500ec4f 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
407e5ecdaa Merge "[CM] Fix NPE due to unvalidated callback value" am: ca7356d684
am: 51ddc176ab

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

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

Change-Id: Ic4715dd79bcc6cb98916045f572a3472813b7ac7
2019-05-22 09:14:41 -07:00
Etan Cohen
ca7356d684 Merge "[CM] Fix NPE due to unvalidated callback value" 2019-05-22 13:53:31 +00:00