Commit Graph

7074 Commits

Author SHA1 Message Date
Luke Huang
3f131de6ff [automerger skipped] Merge changes from topic "am-d829724f7889490d818e6069212702eb" into qt-r1-dev-plus-aosp
am: 8d70675679 -s ours
am skip reason: change_id Idc6db433585de067e45088b43665c8e37b310397 with SHA1 1e2382d098 is in history

Change-Id: Ia8b18e60a606a2b0df916f22d774034dee24517f
2019-05-27 23:05:18 -07:00
Luke Huang
d141a66ed1 [automerger skipped] Merge changes from topic "am-851f19c8d7d34bb48accd48868aae501-qt-dev" into qt-dev am: d8bc2b5a15 am: ec07250973
am: eb5b80daf1 -s ours
am skip reason: change_id Idc6db433585de067e45088b43665c8e37b310397 with SHA1 1e2382d098 is in history

Change-Id: I10bb7c8d36a774fb5ddf4cee37eaba9b3df8e45c
2019-05-27 23:02:33 -07:00
Android Build Merger (Role)
8d70675679 Merge changes from topic "am-d829724f7889490d818e6069212702eb" into qt-r1-dev-plus-aosp
* changes:
  Merge changes from topic "am-851f19c8d7d34bb48accd48868aae501-qt-dev" into qt-dev am: d8bc2b5a15 am: f0b1dc8df4
  [automerger skipped] Add Rfc6724 style sort for DnsResolver and fix potential bug am: 51b9f6c069 -s ours am: 2fdaf771d6 -s ours am skip reason: change_id I0323f5c7f32fc3fa589b9e87f8e7c9caf744dbd4 with SHA1 d352f4ca85 is in history
2019-05-28 05:58:48 +00:00
Luke Huang
ae3583ee45 Merge changes from topic "am-851f19c8d7d34bb48accd48868aae501-qt-dev" into qt-dev am: d8bc2b5a15
am: f0b1dc8df4

Change-Id: Ib9455ba1651241408c1ace6f90d64a23c8ec8dfb
2019-05-27 22:57:40 -07:00
Luke Huang
eb5b80daf1 Merge changes from topic "am-851f19c8d7d34bb48accd48868aae501-qt-dev" into qt-dev am: d8bc2b5a15
am: ec07250973

Change-Id: I385b8c885f4e32a65a50c64fb4730e0f0dc5b6fd
2019-05-27 22:57:34 -07:00
Luke Huang
0911250db9 [automerger skipped] Add Rfc6724 style sort for DnsResolver and fix potential bug am: 51b9f6c069 -s ours
am: 2fdaf771d6 -s ours
am skip reason: change_id I0323f5c7f32fc3fa589b9e87f8e7c9caf744dbd4 with SHA1 d352f4ca85 is in history

Change-Id: Icf444abe7175a0709701fa2865d6c324f911a06f
2019-05-27 22:57:32 -07:00
Luke Huang
f0b1dc8df4 Merge changes from topic "am-851f19c8d7d34bb48accd48868aae501-qt-dev" into qt-dev
am: d8bc2b5a15

Change-Id: I8cd6013a4312d945936a38026285b2e33f6c7c49
2019-05-27 22:52:59 -07:00
Luke Huang
2fdaf771d6 [automerger skipped] Add Rfc6724 style sort for DnsResolver and fix potential bug
am: 51b9f6c069 -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
d8bc2b5a15 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
4aa400f7eb 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
ee744ee6f2 Merge "Wipe the data in IpMemoryStore database upon network factory reset." am: 5ad000a641 am: 0b9f498f86 am: 71950d27d8
am: 322abd62d9

Change-Id: Ia13ff10a57c2043f6676976f23ecfb2d2a9a6ef0
2019-05-27 18:22:55 -07:00
Xiao Ma
322abd62d9 Merge "Wipe the data in IpMemoryStore database upon network factory reset." am: 5ad000a641 am: 0b9f498f86
am: 71950d27d8

Change-Id: Ic042119f35a50cd9abb4c243fc3ba4d767fe2cd4
2019-05-27 18:17:43 -07:00
Xiao Ma
71950d27d8 Merge "Wipe the data in IpMemoryStore database upon network factory reset." am: 5ad000a641
am: 0b9f498f86

Change-Id: I13ad04454e638905b74dd42a1c83266c7c37652f
2019-05-27 18:12:49 -07:00
Xiao Ma
5ad000a641 Merge "Wipe the data in IpMemoryStore database upon network factory reset." 2019-05-28 00:52:00 +00:00
Luke Huang
1e2382d098 Merge "Remove broken test testRfc6724Sort" am: ac6c768bd6 am: 79e97b7d21 am: 577b90a8ef
am: 35c43432dc

Change-Id: Idc6db433585de067e45088b43665c8e37b310397
2019-05-27 11:19:15 -07:00
Chalard Jean
fb50499c8f Merge "Reinstate access to a forgotten member" am: c73af87b45 am: 2f4bd91b99 am: bdee05bfd1
am: c055af9d6d

Change-Id: I99cd44b7ac4ab41b41d0f1345881dd852c9e5e88
2019-05-27 11:17:57 -07:00
Luke Huang
35c43432dc Merge "Remove broken test testRfc6724Sort" am: ac6c768bd6 am: 79e97b7d21
am: 577b90a8ef

Change-Id: Id9bd0d7cb15a7c04102013f9008abc9ce344d5d2
2019-05-27 07:38:27 -07:00
Luke Huang
577b90a8ef Merge "Remove broken test testRfc6724Sort" am: ac6c768bd6
am: 79e97b7d21

Change-Id: I37aa8acc6beeb1e20b99098b1f9e8d5ef800c4eb
2019-05-27 07:33:33 -07:00
Luke Huang
ac6c768bd6 Merge "Remove broken test testRfc6724Sort" 2019-05-27 14:12:05 +00:00
Chalard Jean
c055af9d6d Merge "Reinstate access to a forgotten member" am: c73af87b45 am: 2f4bd91b99
am: bdee05bfd1

Change-Id: If2cce67f40381e3edc8d43a263ea0e5be4af39d0
2019-05-27 04:38:07 -07:00
Chalard Jean
bdee05bfd1 Merge "Reinstate access to a forgotten member" am: c73af87b45
am: 2f4bd91b99

Change-Id: Ib279c0076016c53e0491fc0df8cefff8ae280d66
2019-05-27 04:33:13 -07:00
Treehugger Robot
c73af87b45 Merge "Reinstate access to a forgotten member" 2019-05-27 11:14:37 +00:00
Luke Huang
179c33f322 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
555e408928 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
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