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: b8e0be9df1 -s ours
am skip reason: change_id Iee8bfe418bf6003e5c78df77d75f6f9745249267 with SHA1 3a984ca812 is in history
Change-Id: I7fce20533f0611736019da80ce55ce30398e8370
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: 31812cb71a -s ours
am skip reason: change_id Iee8bfe418bf6003e5c78df77d75f6f9745249267 with SHA1 3a984ca812 is in history
Change-Id: Id1dd03e1b01dc2744f39934bffafe233658c944a
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: 9fdfe85b32 -s ours
am skip reason: change_id Iee8bfe418bf6003e5c78df77d75f6f9745249267 with SHA1 3a984ca812 is in history
Change-Id: I1c0a8f6ede111468f76487ec933efa4c45867db3
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
Change-Id: Iead4e85a2b5c6f3c54695f21ab1e952fdc7c99c9
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: d93f6d545c -s ours
am skip reason: change_id Iee8bfe418bf6003e5c78df77d75f6f9745249267 with SHA1 3a984ca812 is in history
Change-Id: I1e70eb981896dd2382e67771da0da2eeb1168e69
2019-04-08 19:44:08 -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: 255af6675f -s ours
am skip reason: change_id Iee8bfe418bf6003e5c78df77d75f6f9745249267 with SHA1 3a984ca812 is in history
Change-Id: Ib784cfed5a3e51d81fd0a731a10ca778a7e6f794
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: b4583d97e8 -s ours
am skip reason: change_id Iee8bfe418bf6003e5c78df77d75f6f9745249267 with SHA1 3a984ca812 is in history
Change-Id: Ic896792d6c9a2df2a1bb8611078b69688773a2ae
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: c8541fdf00 -s ours
am skip reason: change_id Iee8bfe418bf6003e5c78df77d75f6f9745249267 with SHA1 3a984ca812 is in history
Change-Id: I0a93aa855d17699c81984165eefba942a2ece695
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: 15f4a80a93 -s ours
am skip reason: change_id Iee8bfe418bf6003e5c78df77d75f6f9745249267 with SHA1 3a984ca812 is in history
Change-Id: Id8fe271de667b3e723703ad48c60db77bc801b35
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: b6d3940f89 -s ours
am skip reason: change_id Iee8bfe418bf6003e5c78df77d75f6f9745249267 with SHA1 3a984ca812 is in history
Change-Id: I63b7048673b9de5a85381372f59c10ba91f78c9b
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
Change-Id: I254dbd2d33f340c150ea897823c6c0a257da958d
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
Change-Id: Iacbf91536898e4b0d8942581593ab87eae0af323
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: 50491fb1cc -s ours
am skip reason: change_id Iee8bfe418bf6003e5c78df77d75f6f9745249267 with SHA1 3a984ca812 is in history
Change-Id: I1d5e16687c38854c60aee253b9ac2b01750e6985
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
Change-Id: Ia747dca9285940109dc2aebbfde4d1f184c020cd
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
Change-Id: Ie5459302cb2aa040ed44747f189434091e1c4786
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
Change-Id: I03a2f6f3631c25868d504892c5b885477dcfeb01
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
Change-Id: I0228552c2231e0d2241e3c417e1ac5fe2495e619
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
4a0abf6907
[automerger skipped] Merge "DO NOT MERGE:CDD Annotation for 7.4.7/C-2-1" into pie-cts-dev
...
am: 9709b60914 -s ours
am skip reason: subject contains skip directive
Change-Id: I1e6beb21e5920b6ab96d917919665f426f6d4c2a
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
Brio Automation
7ac21f4f1d
Merge "[automerger skipped] Merge "RESTRICT AUTOMERGE: Port "Exempt adb socket for hostside VpnTest" to Cts 8.1" into oreo-mr1-cts-dev am: af988f0d74 -s ours
...
am: 8e3bef2416 -s ours
am skip reason: subject contains skip directive
Change-Id: Ie2c0ba80b48639562e56fd6fc92944b514a696f1
2019-03-29 15:32:51 -07:00
Android Merger
8e3bef2416
Merge "[automerger skipped] Merge "RESTRICT AUTOMERGE: Port "Exempt adb socket for hostside VpnTest" to Cts 8.1" into oreo-mr1-cts-dev am: af988f0d74 -s ours am skip reason: subject contains skip directive" into pie-cts-dev
2019-03-29 21:55:49 +00:00
Brio Automation
8d7997ef50
[automerger skipped] Merge "RESTRICT AUTOMERGE: Port "Exempt adb socket for hostside VpnTest" to Cts 8.1" into oreo-mr1-cts-dev
...
am: af988f0d74 -s ours
am skip reason: subject contains skip directive
Change-Id: I572f99c9dadc432b15c21da7658fe4d2cc5596b2
2019-03-29 14:55:40 -07:00
Brio Automation
63bfe51c2d
[automerger skipped] Merge "RESTRICT AUTOMERGE: Port "Exempt adb socket for hostside VpnTest" to Cts 8.1" into oreo-mr1-cts-dev am: af988f0d74 -s ours
...
am: ebd34afef5 -s ours
am skip reason: subject contains skip directive
Change-Id: I119d7e01ee076867498ddfb9b33800eb07694126
2019-03-26 17:57:23 -07:00
Brio Automation
ebd34afef5
[automerger skipped] Merge "RESTRICT AUTOMERGE: Port "Exempt adb socket for hostside VpnTest" to Cts 8.1" into oreo-mr1-cts-dev
...
am: af988f0d74 -s ours
am skip reason: subject contains skip directive
Change-Id: I3a482f4e516c0e9e417537478bc155925f0a0ea6
2019-03-26 17:48:22 -07:00
Brio Automation
b84038696c
RESTRICT AUTOMERGE: Port "Exempt adb socket for hostside VpnTest" to Cts 8.1
...
https://android-review.googlesource.com/c/platform/cts/+/833600
Change-Id: Id6f986aacc3cadf713ebbc8305ca535b861390fc
Bug: 119382723
2019-03-26 00:31:14 +00:00
Brett Chabot
2a0aa64145
DO NOT MERGE - Migrate remaining cts to androidx.test.
...
See go/jetpack-test-android-migration
Test: m cts
Change-Id: I148ac492524a07edf6142d884d991c3a3487ce06
Exempt-From-Owner-Approval: automated refactoring, has already been reviewed by owners downstream
Bug: 127482512
2019-03-25 11:51:41 -07:00
Brett Chabot
720760b6fc
[automerger skipped] Merge "DO NOT MERGE - Migrate remaining cts to androidx.test." into pie-cts-dev
...
am: 4fb729db4e -s ours
am skip reason: subject contains skip directive
Change-Id: I71b2f3cb44260abea706f86371339237447f076b
2019-03-12 10:51:16 -07:00
Brett Chabot
c45065bdea
DO NOT MERGE - Migrate remaining cts to androidx.test.
...
See go/jetpack-test-android-migration
Test: m cts
Exempt-From-Owner-Approval: automated refactoring, has already been reviewed by owners downstream
Bug: 127482512
Change-Id: If72aed95ef9e436bcc6e063abc0478eca365cc9b
2019-03-11 23:26:10 +00:00
jungyee.yoo
7a1ba7cace
Merge "Add sleep to avoid calling stopLocalOnlyHotspot before TetherController initialization." into pie-cts-dev
...
am: 4d452396c9
Change-Id: I8e53f1b42ad21330e607827e1b6eedbb0837696d
2019-02-27 15:37:20 -08:00
jungyee.yoo
17ef99be74
Add sleep to avoid calling stopLocalOnlyHotspot before TetherController initialization.
...
Bug: 123205589
Test: run cts-on-gsi -m -m CtsNetTestCases -t android.net.wifi.cts.WifiManagerTest#testStartLocalOnlyHotspotSingleRequestByApps
Bug: 123379970
Test: run cts-on-gsi -m -m CtsNetTestCases -t ndroid.net.wifi.cts.WifiManagerTest#testStartLocalOnlyHotspotSuccess
Change-Id: I7506c3037dc5368d69330acc47c97c765185870f
2019-02-14 00:18:23 +00:00
Juju Sung
5e7629b84a
Merge "Fix lowMemoryKill with app2.MyService" into pie-cts-dev
...
am: 86ca1697d0
Change-Id: Ie2858fee81196b360cca2179cba4052ad0ef8831
2018-12-25 00:25:43 -08:00
Treehugger Robot
86ca1697d0
Merge "Fix lowMemoryKill with app2.MyService" into pie-cts-dev
2018-12-25 08:13:30 +00:00
Juju Sung
62eb00af49
Fix lowMemoryKill with app2.MyService
...
MyForegroundService.java will change to background service during
testing,It’s ADJ will be 900. When run on a 512M project, it will
easily killed due to low memory.
Only set BIND_NOT_FOREGROUND and remove BIND_ALLOW_OOM_MANAGEMENT.
So MyForegroundService can still change process state between foreground
and background by startFround()/stopFround(). But it's ADJ will not too
high in background.
Bug: 120038371
Test: VTS, ran the test 5 times and it passed 5 times
Change-Id: I555366db7dd9904bc119bea94efbbe6422764f69
2018-12-25 08:07:26 +00:00
Rebecca Silberstein
d543481f22
Merge "[automerger skipped] Merge "WifiManagerTest: allow for multiple modes" into oreo-cts-dev am: 8c61445473 -s ours" into oreo-mr1-cts-dev am: 7bd8640f4d -s ours
...
am: 97a50a1348 -s ours
Change-Id: I6675f933f29508f9b553ecad62b18e14823b9100
2018-12-05 21:31:36 -08:00
Rebecca Silberstein
19fe49302c
Merge "Merge "[automerger skipped] Merge "WifiManagerTest: allow for multiple modes" into oreo-cts-dev am: 8c61445473 -s ours" into oreo-mr1-cts-dev am: 7bd8640f4d -s ours" into pie-cts-dev
...
am: a9d9e557e6 -s ours
Change-Id: I5b19971e761cdbce47c483873407e0a7a7fc7813
2018-12-05 21:09:14 -08:00
Rebecca Silberstein
97a50a1348
Merge "[automerger skipped] Merge "WifiManagerTest: allow for multiple modes" into oreo-cts-dev am: 8c61445473 -s ours" into oreo-mr1-cts-dev
...
am: 7bd8640f4d -s ours
Change-Id: I3c6b067aa7bf8e1c54481dba8220f986d52a8687
2018-12-05 21:07:45 -08:00