am: 8d70675679 -s ours
am skip reason: change_id Idc6db433585de067e45088b43665c8e37b310397 with SHA1 1e2382d098 is in history
Change-Id: Ia8b18e60a606a2b0df916f22d774034dee24517f
am: eb5b80daf1 -s ours
am skip reason: change_id Idc6db433585de067e45088b43665c8e37b310397 with SHA1 1e2382d098 is in history
Change-Id: I10bb7c8d36a774fb5ddf4cee37eaba9b3df8e45c
* 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
am: 2fdaf771d6 -s ours
am skip reason: change_id I0323f5c7f32fc3fa589b9e87f8e7c9caf744dbd4 with SHA1 d352f4ca85 is in history
Change-Id: Icf444abe7175a0709701fa2865d6c324f911a06f
am: 51b9f6c069 -s ours
am skip reason: change_id I0323f5c7f32fc3fa589b9e87f8e7c9caf744dbd4 with SHA1 d352f4ca85 is in history
Change-Id: Ie4e69c27646febd06df2b93361f431dbd51bde4f
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
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
am: e188af49a9 -s ours
am skip reason: change_id I243db4c406cca826e803c8035268bc0c6e6e01e2 with SHA1 2c593ec776 is in history
Change-Id: I1576f42c89041bd6f3bea1ff37a4141333dc9bb5
am: 7b5d4c2fae -s ours
am skip reason: change_id I243db4c406cca826e803c8035268bc0c6e6e01e2 with SHA1 2c593ec776 is in history
Change-Id: Ia4aab74014d166e1145e2c65b5018b0ace47c3fd
am: fcf0ced706 -s ours
am skip reason: change_id I243db4c406cca826e803c8035268bc0c6e6e01e2 with SHA1 2c593ec776 is in history
Change-Id: I5ddb5d0d856960d226d41ca561d665be1accd4d2
am: ff9340a1b0 -s ours
am skip reason: change_id I243db4c406cca826e803c8035268bc0c6e6e01e2 with SHA1 2c593ec776 is in history
Change-Id: Ic0b0150bb5c5ddcaeff17b27f454d96b795892ca
am: 399b7500af -s ours
am skip reason: change_id I243db4c406cca826e803c8035268bc0c6e6e01e2 with SHA1 2c593ec776 is in history
Change-Id: I09ce684da6680c5c20de4e3f0a7cf741f85131ec
am: 6879cc6bc1 -s ours
am skip reason: change_id I84cde7d3757953bc0bf761727d64a715bcdd68bb with SHA1 158ac5a39e is in history
Change-Id: Ied672c64c5dfba005b51485013bf8d3892cca485
am: 37eb1e4f65 -s ours
am skip reason: change_id Ia2cc04b42288ea987483e5ab0e0a10093dc49502 with SHA1 c8289e40a4 is in history
Change-Id: I85bfb02cecefcbe771d2e09e148a0a97acba75f7
am: 073dcff305 -s ours
am skip reason: change_id I84cde7d3757953bc0bf761727d64a715bcdd68bb with SHA1 99869f413a is in history
Change-Id: I2e5c8a3bd6266d178c98cc77359dccfa9043024d
am: 1dc7494bbb -s ours
am skip reason: change_id Ia2cc04b42288ea987483e5ab0e0a10093dc49502 with SHA1 cc65a628eb is in history
Change-Id: Ia9ba7d96b94e5cab416663149b168cd0734409fa
am: 671a0df6d6 -s ours
am skip reason: change_id Idf49e840263ef32b9ee4fafa6718d4f893ea7c87 with SHA1 91ddb23d66 is in history
Change-Id: I4cbc1eb8edbc44b85caa08ade3ce9f6673c92152
am: b68b05d1e5 -s ours
am skip reason: change_id Idf49e840263ef32b9ee4fafa6718d4f893ea7c87 with SHA1 91ddb23d66 is in history
Change-Id: Iffdde8d9465ac6b0526127f96380210618ae459a
am: 6e300a80fb -s ours
am skip reason: change_id I84cde7d3757953bc0bf761727d64a715bcdd68bb with SHA1 99869f413a is in history
Change-Id: I810ad402c4bef38fe1f2c7dcb0e0ab543d81b69b
am: d954300cb5 -s ours
am skip reason: change_id Ia2cc04b42288ea987483e5ab0e0a10093dc49502 with SHA1 c8289e40a4 is in history
Change-Id: I304be543fe4f0323804da4da0b4b68c63942a264
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)
am: f68f9d9f36 -s ours
am skip reason: change_id I84cde7d3757953bc0bf761727d64a715bcdd68bb with SHA1 99869f413a is in history
Change-Id: Ie09912db7602806b34700fb6553334413f9aafc0