Lorenzo Colitti
97c67cbbbd
[automerger skipped] Merge "Merge "Merge "Merge "Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354" into nougat-mr1-cts-dev am: 50491fb1cc" into oreo-cts-dev am: b6d3940f89" into oreo-mr1-cts-dev am: d93f6d545c" into pie-cts-dev am: f9b246a320 -s ours
...
am: b54262d0123a984ca812
2019-04-08 21:46:51 -07:00
Lorenzo Colitti
1d5ebfdb15
[automerger skipped] Merge "Merge "Merge "Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354" into nougat-mr1-cts-dev am: 50491fb1cc" into oreo-cts-dev am: b6d3940f89" into oreo-mr1-cts-dev am: d93f6d545c -s ours am: b8e0be9df1 -s ours
...
am: 151652e8183a984ca812
2019-04-08 21:37:43 -07:00
Lorenzo Colitti
94a9d6277c
[automerger skipped] Merge "Merge "Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354" into nougat-mr1-cts-dev am: 50491fb1cc" into oreo-cts-dev am: b6d3940f89 -s ours am: c8541fdf00 -s ours am: 255af6675f -s ours am: 31812cb71a -s ours
...
am: c3f02ab9853a984ca812
2019-04-08 21:32:24 -07:00
Lorenzo Colitti
08ad6259ad
[automerger skipped] Merge "Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354" into nougat-mr1-cts-dev am: 50491fb1cc -s ours am: 15f4a80a93 -s ours am: b4583d97e8 -s ours am: 9fdfe85b32 -s ours
...
am: 57a0d8740c3a984ca812
2019-04-08 21:27:00 -07:00
Lorenzo Colitti
d9ca6f1831
[automerger skipped] [automerger] Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354 am: d4831efbe0 am: 88a48fcbfe am: 9c3250f49c am: 761b3e5e7b am: e7ee057428 am: bc9edb5254 am: 296cfbb29c am: 27bbe03b65
...
am: ea06420fed3852fd92f5
2019-04-08 21:21:26 -07:00
Lorenzo Colitti
b54262d012
[automerger skipped] Merge "Merge "Merge "Merge "Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354" into nougat-mr1-cts-dev am: 50491fb1cc" into oreo-cts-dev am: b6d3940f89" into oreo-mr1-cts-dev am: d93f6d545c" into pie-cts-dev
...
am: f9b246a3203a984ca812
2019-04-08 20:33:12 -07:00
Lorenzo Colitti
151652e818
[automerger skipped] Merge "Merge "Merge "Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354" into nougat-mr1-cts-dev am: 50491fb1cc" into oreo-cts-dev am: b6d3940f89" into oreo-mr1-cts-dev am: d93f6d545c -s ours
...
am: b8e0be9df13a984ca812
2019-04-08 20:15:38 -07:00
Lorenzo Colitti
c3f02ab985
[automerger skipped] Merge "Merge "Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354" into nougat-mr1-cts-dev am: 50491fb1cc" into oreo-cts-dev am: b6d3940f89 -s ours am: c8541fdf00 -s ours am: 255af6675f -s ours
...
am: 31812cb71a3a984ca812
2019-04-08 20:11:13 -07:00
Lorenzo Colitti
57a0d8740c
[automerger skipped] Merge "Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354" into nougat-mr1-cts-dev am: 50491fb1cc -s ours am: 15f4a80a93 -s ours am: b4583d97e8 -s ours
...
am: 9fdfe85b323a984ca812
2019-04-08 20:06:36 -07:00
Lorenzo Colitti
ea06420fed
[automerger] Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354 am: d4831efbe0 am: 88a48fcbfe am: 9c3250f49c am: 761b3e5e7b am: e7ee057428 am: bc9edb5254 am: 296cfbb29c
...
am: 27bbe03b65
2019-04-08 20:01:58 -07:00
Lorenzo Colitti
b8e0be9df1
[automerger skipped] Merge "Merge "Merge "Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354" into nougat-mr1-cts-dev am: 50491fb1cc" into oreo-cts-dev am: b6d3940f89" into oreo-mr1-cts-dev
...
am: d93f6d545c3a984ca812
2019-04-08 19:44:08 -07:00
Android Merger
f9b246a320
Merge "Merge "Merge "Merge "Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354" into nougat-mr1-cts-dev am: 50491fb1cc" into oreo-cts-dev am: b6d3940f89" into oreo-mr1-cts-dev am: d93f6d545c" into pie-cts-dev
2019-04-09 02:38:32 +00:00
Lorenzo Colitti
aaac541459
Merge "Merge "Merge "Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354" into nougat-mr1-cts-dev am: 50491fb1cc" into oreo-cts-dev am: b6d3940f89" into oreo-mr1-cts-dev
...
am: d93f6d545c
2019-04-08 19:38:21 -07:00
Lorenzo Colitti
31812cb71a
[automerger skipped] Merge "Merge "Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354" into nougat-mr1-cts-dev am: 50491fb1cc" into oreo-cts-dev am: b6d3940f89 -s ours am: c8541fdf00 -s ours
...
am: 255af6675f3a984ca812
2019-04-08 19:32:33 -07:00
Lorenzo Colitti
9fdfe85b32
[automerger skipped] Merge "Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354" into nougat-mr1-cts-dev am: 50491fb1cc -s ours am: 15f4a80a93 -s ours
...
am: b4583d97e83a984ca812
2019-04-08 19:28:46 -07:00
Lorenzo Colitti
255af6675f
[automerger skipped] Merge "Merge "Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354" into nougat-mr1-cts-dev am: 50491fb1cc" into oreo-cts-dev am: b6d3940f89 -s ours
...
am: c8541fdf003a984ca812
2019-04-08 19:21:24 -07:00
Lorenzo Colitti
b4583d97e8
[automerger skipped] Merge "Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354" into nougat-mr1-cts-dev am: 50491fb1cc -s ours
...
am: 15f4a80a933a984ca812
2019-04-08 19:18:09 -07:00
Lorenzo Colitti
c8541fdf00
[automerger skipped] Merge "Merge "Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354" into nougat-mr1-cts-dev am: 50491fb1cc" into oreo-cts-dev
...
am: b6d3940f893a984ca812
2019-04-08 19:02:38 -07:00
Lorenzo Colitti
27bbe03b65
[automerger] Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354 am: d4831efbe0 am: 88a48fcbfe am: 9c3250f49c am: 761b3e5e7b am: e7ee057428 am: bc9edb5254
...
am: 296cfbb29c
2019-04-08 18:26:32 -07:00
Android Merger
d93f6d545c
Merge "Merge "Merge "Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354" into nougat-mr1-cts-dev am: 50491fb1cc" into oreo-cts-dev am: b6d3940f89" into oreo-mr1-cts-dev
2019-04-09 00:52:27 +00:00
Lorenzo Colitti
926ebf2d47
Merge "Merge "Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354" into nougat-mr1-cts-dev am: 50491fb1cc" into oreo-cts-dev
...
am: b6d3940f89
2019-04-08 17:52:15 -07:00
Android Build Merger (Role)
15f4a80a93
[automerger skipped] Merge "Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354" into nougat-mr1-cts-dev am: 50491fb1cc -s ours am skip reason: change_id Iee8bfe418bf6003e5c78df77d75f6f9745249267 with SHA1 833 skipped: 1b13dec4ca
...
Change-Id: I02088c35c326599b5d3fc3164d9c6f8bac76601d
2019-04-09 00:26:23 +00:00
Android Build Merger (Role)
1b13dec4ca
[automerger skipped] Merge "Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354" into nougat-mr1-cts-dev am: 50491fb1cc -s ours am skip reason: change_id Iee8bfe418bf6003e5c78df77d75f6f9745249267 with SHA1 833 skipped: 1fcd704e84
...
Change-Id: I36d4291bdf7ce0648eff1c47f95747327c9fdfa6
2019-04-09 00:26:20 +00:00
Android Build Merger (Role)
1fcd704e84
[automerger skipped] Merge "Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354" into nougat-mr1-cts-dev am: 50491fb1cc -s ours am skip reason: change_id Iee8bfe418bf6003e5c78df77d75f6f9745249267 with SHA1 833 skipped: 1b50f30867
...
Change-Id: I858c784b3729e6646775b1c148613ad0656b1e13
2019-04-09 00:26:16 +00:00
Lorenzo Colitti
1b50f30867
[automerger skipped] Merge "Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354" into nougat-mr1-cts-dev
...
am: 50491fb1cc3a984ca812
2019-04-08 17:25:56 -07:00
Lorenzo Colitti
296cfbb29c
[automerger] Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354 am: d4831efbe0 am: 88a48fcbfe am: 9c3250f49c am: 761b3e5e7b am: e7ee057428
...
am: bc9edb5254
2019-04-08 17:10:16 -07:00
Android Merger
b6d3940f89
Merge "Merge "Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354" into nougat-mr1-cts-dev am: 50491fb1cc" into oreo-cts-dev
2019-04-09 00:06:54 +00:00
Lorenzo Colitti
454f3193a3
Merge "Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354" into nougat-mr1-cts-dev
...
am: 50491fb1cc
2019-04-08 17:06:38 -07:00
Android Merger
50491fb1cc
Merge "Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354" into nougat-mr1-cts-dev
2019-04-08 23:32:07 +00:00
Lorenzo Colitti
fe13c7233d
Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev
...
am: 3b416dd354
2019-04-08 16:31:57 -07:00
Android Build Merger (Role)
bc9edb5254
[automerger] Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354 am: d4831efbe0 am: 88a48fcbfe am: 9c3250f49c am: 761b3e5e7b am: e7ee057428
...
Change-Id: I9fcc6c2dd3bc35112f0959a77ec48c19e741f6a4
2019-04-08 23:26:34 +00:00
Android Build Merger (Role)
e7ee057428
[automerger] Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354 am: d4831efbe0 am: 88a48fcbfe am: 9c3250f49c am: 761b3e5e7b
...
Change-Id: Iab6abb5e32ed7bff2e75564446166cc182640d59
2019-04-08 23:26:31 +00:00
Android Build Merger (Role)
761b3e5e7b
[automerger] Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354 am: d4831efbe0 am: 88a48fcbfe am: 9c3250f49c
...
Change-Id: Ia126d22b102f0279432f6f4a92b14dfa8626f453
2019-04-08 23:26:27 +00:00
Android Build Merger (Role)
9c3250f49c
[automerger] Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354 am: d4831efbe0 am: 88a48fcbfe
...
Change-Id: I100af07ea8c391545d48b6b8888696a3622b54ec
2019-04-08 23:26:23 +00:00
Android Build Merger (Role)
88a48fcbfe
[automerger] Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354 am: d4831efbe0
...
Change-Id: Ie85fee065ec9aef98036b75bf1b2497d760b8070
2019-04-08 23:26:20 +00:00
Lorenzo Colitti
d4831efbe0
Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev
...
am: 3b416dd354
2019-04-08 16:26:02 -07:00
Treehugger Robot
3b416dd354
Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev
2019-04-08 22:33:39 +00:00
saurav subedi
a1c7a532ed
[automerger skipped] Merge "DO NOT MERGE:CDD Annotation for 7.4.7/C-2-1" into pie-cts-dev am: 9709b60914 -s ours
...
am: 4a0abf6907
2019-04-08 13:43:57 -07:00
saurav subedi
4a0abf6907
[automerger skipped] Merge "DO NOT MERGE:CDD Annotation for 7.4.7/C-2-1" into pie-cts-dev
...
am: 9709b60914
2019-04-08 13:06:51 -07:00
Treehugger Robot
9709b60914
Merge "DO NOT MERGE:CDD Annotation for 7.4.7/C-2-1" into pie-cts-dev
2019-04-08 19:40:27 +00:00
Lorenzo Colitti
3a984ca812
Fix expected reverse lookup of Google DNS IP addresses
...
DnsTest.testDnsWorks expects that reverse lookup for the Google
public DNS servers will return something with google.com in the
name. This no longer works because the reverse DNS entries have
changed to dns.google.
Bug: 129452237
Test: atest android.net.cts.DnsTest.testDnsWorks
Change-Id: Iee8bfe418bf6003e5c78df77d75f6f9745249267
Merged-In: Iee8bfe418bf6003e5c78df77d75f6f9745249267
(cherry picked from commit 3852fd92f5
2019-04-08 00:21:48 +00:00
saurav subedi
d11be5bbeb
DO NOT MERGE:CDD Annotation for 7.4.7/C-2-1
...
Devices that don't provide data saver mode must return
RESTRICT_BACKGROUND_STATUS_DISABLED for the
ConnectivityManager#getRestrictBackgroundStatus()
Bug:130032710
Test: make cts
Change-Id: I81b52c9d26afcf51a7e416d20589c9c7cfb878f6
2019-04-05 20:23:53 +00:00
Bill Rassieur
b45736c50d
Merge master@5406228 into git_qt-dev-plus-aosp.
...
am: e2fd217b4c
2019-04-03 16:13:28 -07:00
Mark Chien
d4ed482869
Merge "[KA09] add cts test for tcp keepalive offload" am: e8fb173b7d am: 25a820bdb9
...
am: da0ae30f64
2019-04-03 03:43:41 -07:00
Mark Chien
da0ae30f64
Merge "[KA09] add cts test for tcp keepalive offload" am: e8fb173b7d
...
am: 25a820bdb9
2019-04-03 03:34:46 -07:00
Mark Chien
25a820bdb9
Merge "[KA09] add cts test for tcp keepalive offload"
...
am: e8fb173b7d
2019-04-03 03:25:52 -07:00
Mark Chien
e8fb173b7d
Merge "[KA09] add cts test for tcp keepalive offload"
2019-04-03 09:36:52 +00:00
markchien
5dc1681823
[KA09] add cts test for tcp keepalive offload
...
Add a test case to make sure tcp keepalive offload starts
correctly.
Bug: 114151147
Test: atest ConnectivityManagerTest#testCreateTcpKeepalive
Change-Id: Iaf1c2fab755f3df8e866b4988f64c25906e1737a
2019-04-03 13:50:39 +08:00
Junyu Lai
52c4286d77
Merge "Fix tests in TrafficStatsTest that are affected by adb over network" am: 553872fc04 am: 1e68a61016
...
am: ec75966da1
2019-04-01 20:08:12 -07:00
Junyu Lai
ec75966da1
Merge "Fix tests in TrafficStatsTest that are affected by adb over network" am: 553872fc04
...
am: 1e68a61016
2019-04-01 19:37:54 -07:00
