Roshan Pius
8619176b0c
resolve merge conflicts of 8c61445473bc2842c8c9490225e97321b65d267c to oc-dev
...
am: 934ff00f93
2018-12-04 20:40:44 -08:00
Roshan Pius
934ff00f93
resolve merge conflicts of 8c61445473bc2842c8c9490225e97321b65d267c to oc-dev
...
Bug: 120508352
Change-Id: I43ebc07102d0b765321a4b83c04ff899f2b8ed0c
Merged-In: Id3aaacb3651568c18850a0fdf3832c0f52218cf2
2018-12-05 03:15:07 +00:00
Rebecca Silberstein
af95fad957
WifiManagerTest: allow for multiple modes
...
Now that WifiService can/will support dual simultaneous mode operation, make
sure the tests allow for it as well.
Bug: 31346104
Bug: 115567184
Test: atest android.net.wifi.cts
Change-Id: Id3aaacb3651568c18850a0fdf3832c0f52218cf2
Merged-In: Id3aaacb3651568c18850a0fdf3832c0f52218cf2
2018-11-29 15:24:49 +08:00
Ray Essick
b8f58fb9b6
Merge "Merge changes from topic "am-ce014dceeecf45abb673c6f026ccf980" into oreo-cts-dev am: dbfdb95147" into oc-dev
...
am: be259ff997
2018-04-09 18:41:09 -07:00
Ray Essick
6edfe17ca2
Merge "[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours am: afb3e84599 -s ours am: bafd18446f -s ours am: 72b96b0354 -s ours" into oc-dev
...
am: 68dc050239
2018-04-09 18:01:25 -07:00
Ray Essick
d89cacb7bf
[automerger] Merge changes from topic "am-c4615261ef624ee49e66b0c52ff3f69c" into nougat-mr1-cts-dev am: 8ef12d94da am: 1ce0bfba89 am: afef57cad5 am: 1e1b2a7606
...
am: 9289660d76
2018-04-09 17:56:53 -07:00
Ray Essick
56927e7cae
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours am: afb3e84599 -s ours am: bafd18446f -s ours skipped: d033198a42 skipped: c550755e79 skipped: 27bbc3628e
...
am: ce176b9ffc
2018-04-09 17:54:49 -07:00
Ray Essick
14e18f9179
[automerger] Merge changes from topic "am-157f76c7fc0b4412b75bfe4f38cb6b0f" into nougat-cts-dev am: 1fd90c968d am: e451b4062e am: c2f39f64b5 am: 02cf01f51c am: 010e44479d am: 790a6f6d52
...
am: df21617fed
2018-04-09 17:50:54 -07:00
Ray Essick
591f6ccb9c
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours am: afb3e84599 -s ours skipped: 868997117d skipped: a4cf60e6ea skipped: 8b6d971588 skipped: 63eae3a9e1 skipped: 1a158af55d
...
am: 096c85e4cf
2018-04-09 17:48:42 -07:00
Ray Essick
10bed1ef52
[automerger] Merge changes from topic "asb-2018-04-m" into marshmallow-cts-dev am: 7f0c5e7da8 am: 6d52324524 am: 87ad8f6dcb am: 70171fe46e am: 6035791a0f am: c0ca2003bc am: c4691f5ad5 am: d27bde6edf am: c5c83b10ac am: 41c0a7b438
...
am: a11caf34cc
2018-04-09 17:45:03 -07:00
Ray Essick
06c461a30b
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours skipped: 151750d842 skipped: d1811f0384 skipped: bbfa5d23a9 skipped: c407f8968b skipped: 6fc9eb97c5 skipped: 973a5cd865 skipped: cd9a559fd2 skipped: 853c5 skipped: c26ea26d31
...
am: 4d4f3950b6
2018-04-09 17:42:39 -07:00
Ray Essick
72405a1736
[automerger] Merge changes from topic "am-c7faa8cb80994bb993d5bdac6eca009c" into nougat-mr1-cts-dev am: 36b9badd7a am: 27b937e5fc am: 8c0df95444 am: 0c19a15081
...
am: fbc9d49796
2018-04-09 17:38:19 -07:00
Ray Essick
66ef84dac4
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74 -s ours am: 81f274ebb2 -s ours skipped: 1cdd92daaa skipped: 7a92b9afdb skipped: 849e67fad2
...
am: d2e50eb968
2018-04-09 17:36:24 -07:00
Ray Essick
37ca5b50e8
Merge changes from topic "am-4267ce935a9849bdbcbcc7e45cbacd34" into oreo-cts-dev am: 1c90ff8dcf
...
am: 5b5f73c2e8
2018-04-09 17:33:40 -07:00
Ray Essick
7a3920dfa4
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74 -s ours am: 81f274ebb2 -s ours am: 308f60a04c -s ours
...
am: c1a7ce019c
2018-04-09 17:16:08 -07:00
Android Build Merger (Role)
be259ff997
Merge "Merge changes from topic "am-ce014dceeecf45abb673c6f026ccf980" into oreo-cts-dev am: dbfdb95147" into oc-dev
2018-04-10 00:14:42 +00:00
Android Build Merger (Role)
68dc050239
Merge "[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours am: afb3e84599 -s ours am: bafd18446f -s ours am: 72b96b0354 -s ours" into oc-dev
2018-04-10 00:14:08 +00:00
Ray Essick
6b4abc5610
Merge changes from topic "am-ce014dceeecf45abb673c6f026ccf980" into oreo-cts-dev
...
am: dbfdb95147
2018-04-09 17:13:42 -07:00
Ray Essick
52d573a044
Merge changes from topic "am-0ac6ccf47239465e9891c4d8b9d8f076" into oc-dev
...
am: 7fc94d02ca
2018-04-09 17:13:22 -07:00
Ray Essick
5967d48708
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours am: afb3e84599 -s ours am: bafd18446f -s ours
...
am: 72b96b0354
2018-04-09 17:12:59 -07:00
Android Build Merger (Role)
9289660d76
[automerger] Merge changes from topic "am-c4615261ef624ee49e66b0c52ff3f69c" into nougat-mr1-cts-dev am: 8ef12d94da am: 1ce0bfba89 am: afef57cad5 am: 1e1b2a7606
...
Change-Id: If096ea0d5c073cecf2e8e22a59b102702a42a15c
2018-04-10 00:10:38 +00:00
Android Build Merger (Role)
1e1b2a7606
[automerger] Merge changes from topic "am-c4615261ef624ee49e66b0c52ff3f69c" into nougat-mr1-cts-dev am: 8ef12d94da am: 1ce0bfba89 am: afef57cad5
...
Change-Id: I95c778fbe4453b8e89991af0fefce3b1fff52e40
2018-04-10 00:10:34 +00:00
Android Build Merger (Role)
afef57cad5
[automerger] Merge changes from topic "am-c4615261ef624ee49e66b0c52ff3f69c" into nougat-mr1-cts-dev am: 8ef12d94da am: 1ce0bfba89
...
Change-Id: Ic9741b09169ad6ad4c1c7874fd59c090f4111fc6
2018-04-10 00:10:30 +00:00
Android Build Merger (Role)
ce176b9ffc
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours am: afb3e84599 -s ours am: bafd18446f -s ours skipped: d033198a42 skipped: c550755e79 skipped: 27bbc3628e
...
Change-Id: I5c8a8aa2a76cf62357d437385d907a4df9398a95
2018-04-10 00:10:05 +00:00
Android Build Merger (Role)
27bbc3628e
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours am: afb3e84599 -s ours am: bafd18446f -s ours skipped: d033198a42 skipped: c550755e79
...
Change-Id: Ie28a51e1566ef41b05e6ff03c03129ada1a20c23
2018-04-10 00:10:02 +00:00
Android Build Merger (Role)
c550755e79
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours am: afb3e84599 -s ours am: bafd18446f -s ours skipped: d033198a42
...
Change-Id: Ib74134a9b610ec81c2dd0b428efadc955dfe032a
2018-04-10 00:09:58 +00:00
Ray Essick
1ce0bfba89
Merge changes from topic "am-c4615261ef624ee49e66b0c52ff3f69c" into nougat-mr1-cts-dev
...
am: 8ef12d94da
2018-04-09 17:09:35 -07:00
Ray Essick
ee4732c77c
Merge changes from topic "asb-2018-04-o" into oreo-cts-dev am: 6977a333a5
...
am: 51fa4a4cc9
2018-04-09 17:06:44 -07:00
Ray Essick
d033198a42
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours am: afb3e84599 -s ours
...
am: bafd18446f
2018-04-09 17:05:38 -07:00
Ray Essick
a208a33079
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: ae91a6ad6f -s ours
...
am: 81c482bdd4
2018-04-09 17:03:44 -07:00
Android Build Merger (Role)
df21617fed
[automerger] Merge changes from topic "am-157f76c7fc0b4412b75bfe4f38cb6b0f" into nougat-cts-dev am: 1fd90c968d am: e451b4062e am: c2f39f64b5 am: 02cf01f51c am: 010e44479d am: 790a6f6d52
...
Change-Id: I27f46c383d9ca5760aa4d15ff6823626ca3e0a92
2018-04-09 23:58:08 +00:00
Android Build Merger (Role)
790a6f6d52
[automerger] Merge changes from topic "am-157f76c7fc0b4412b75bfe4f38cb6b0f" into nougat-cts-dev am: 1fd90c968d am: e451b4062e am: c2f39f64b5 am: 02cf01f51c am: 010e44479d
...
Change-Id: I6a578e4e3c63f23263fcabfa11859bcb30f10aaa
2018-04-09 23:58:04 +00:00
Android Build Merger (Role)
010e44479d
[automerger] Merge changes from topic "am-157f76c7fc0b4412b75bfe4f38cb6b0f" into nougat-cts-dev am: 1fd90c968d am: e451b4062e am: c2f39f64b5 am: 02cf01f51c
...
Change-Id: I8e84f13cf6f8f31ad96562acfce7d503b6b73304
2018-04-09 23:58:00 +00:00
Android Build Merger (Role)
02cf01f51c
[automerger] Merge changes from topic "am-157f76c7fc0b4412b75bfe4f38cb6b0f" into nougat-cts-dev am: 1fd90c968d am: e451b4062e am: c2f39f64b5
...
Change-Id: Iea5d02461fb181773d87e87cecae8ebd7fa4dfe3
2018-04-09 23:57:55 +00:00
Android Build Merger (Role)
c2f39f64b5
[automerger] Merge changes from topic "am-157f76c7fc0b4412b75bfe4f38cb6b0f" into nougat-cts-dev am: 1fd90c968d am: e451b4062e
...
Change-Id: If5d1bb2ea504d9ca25a661e49eeb68274e02735c
2018-04-09 23:57:51 +00:00
Android Build Merger (Role)
096c85e4cf
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours am: afb3e84599 -s ours skipped: 868997117d skipped: a4cf60e6ea skipped: 8b6d971588 skipped: 63eae3a9e1 skipped: 1a158af55d
...
Change-Id: I8dc0cbf8fa692044f8faf89caeb376f4cd3fdff7
2018-04-09 23:57:09 +00:00
Android Build Merger (Role)
1a158af55d
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours am: afb3e84599 -s ours skipped: 868997117d skipped: a4cf60e6ea skipped: 8b6d971588 skipped: 63eae3a9e1
...
Change-Id: Ifd91317fdfdb04e1e871cacb85eaacb056ecc5bf
2018-04-09 23:57:06 +00:00
Android Build Merger (Role)
63eae3a9e1
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours am: afb3e84599 -s ours skipped: 868997117d skipped: a4cf60e6ea skipped: 8b6d971588
...
Change-Id: I66b017a380139a43f5c6fad8e86b69509f1cb834
2018-04-09 23:57:01 +00:00
Android Build Merger (Role)
8b6d971588
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours am: afb3e84599 -s ours skipped: 868997117d skipped: a4cf60e6ea
...
Change-Id: If7186d1a551c931e37ce6481f60bff81ffc3ba9f
2018-04-09 23:56:58 +00:00
Android Build Merger (Role)
a4cf60e6ea
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours am: afb3e84599 -s ours skipped: 868997117d
...
Change-Id: Iac9c8c8265809970e40abcdeb1600db0bd537df2
2018-04-09 23:56:54 +00:00
Ray Essick
e451b4062e
Merge changes from topic "am-157f76c7fc0b4412b75bfe4f38cb6b0f" into nougat-cts-dev
...
am: 1fd90c968d
2018-04-09 16:56:40 -07:00
Ray Essick
868997117d
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours
...
am: afb3e84599
2018-04-09 16:54:52 -07:00
Android Merger
dbfdb95147
Merge changes from topic "am-ce014dceeecf45abb673c6f026ccf980" into oreo-cts-dev
...
* changes:
Merge changes from topic "am-c4615261ef624ee49e66b0c52ff3f69c" into nougat-mr1-cts-dev am: 8ef12d94daafb3e84599bafd18446f
2018-04-09 23:51:21 +00:00
Ray Essick
793b437465
Merge changes from topic "am-c4615261ef624ee49e66b0c52ff3f69c" into nougat-mr1-cts-dev
...
am: 8ef12d94da
2018-04-09 16:51:06 -07:00
Android Build Merger (Role)
a11caf34cc
[automerger] Merge changes from topic "asb-2018-04-m" into marshmallow-cts-dev am: 7f0c5e7da8 am: 6d52324524 am: 87ad8f6dcb am: 70171fe46e am: 6035791a0f am: c0ca2003bc am: c4691f5ad5 am: d27bde6edf am: c5c83b10ac am: 41c0a7b438
...
Change-Id: I80cce468813cad4e8cbd49e8971e38be03440784
2018-04-09 23:49:16 +00:00
Android Build Merger (Role)
41c0a7b438
[automerger] Merge changes from topic "asb-2018-04-m" into marshmallow-cts-dev am: 7f0c5e7da8 am: 6d52324524 am: 87ad8f6dcb am: 70171fe46e am: 6035791a0f am: c0ca2003bc am: c4691f5ad5 am: d27bde6edf am: c5c83b10ac
...
Change-Id: Ied035b45458a143f3c9fd7fb20aa8f658418034b
2018-04-09 23:49:12 +00:00
Android Build Merger (Role)
c5c83b10ac
[automerger] Merge changes from topic "asb-2018-04-m" into marshmallow-cts-dev am: 7f0c5e7da8 am: 6d52324524 am: 87ad8f6dcb am: 70171fe46e am: 6035791a0f am: c0ca2003bc am: c4691f5ad5 am: d27bde6edf
...
Change-Id: I5aab9ff7ac9f7fa424e2608dcaba77e2b2916dbb
2018-04-09 23:49:08 +00:00
Android Build Merger (Role)
d27bde6edf
[automerger] Merge changes from topic "asb-2018-04-m" into marshmallow-cts-dev am: 7f0c5e7da8 am: 6d52324524 am: 87ad8f6dcb am: 70171fe46e am: 6035791a0f am: c0ca2003bc am: c4691f5ad5
...
Change-Id: I8293081120821576357af0be19381165591881ec
2018-04-09 23:49:04 +00:00
Android Build Merger (Role)
c4691f5ad5
[automerger] Merge changes from topic "asb-2018-04-m" into marshmallow-cts-dev am: 7f0c5e7da8 am: 6d52324524 am: 87ad8f6dcb am: 70171fe46e am: 6035791a0f am: c0ca2003bc
...
Change-Id: I6c2503296ecba421bd2da55ff5f3fbe816df9de4
2018-04-09 23:49:01 +00:00
Android Build Merger (Role)
c0ca2003bc
[automerger] Merge changes from topic "asb-2018-04-m" into marshmallow-cts-dev am: 7f0c5e7da8 am: 6d52324524 am: 87ad8f6dcb am: 70171fe46e am: 6035791a0f
...
Change-Id: I41f38c1c453af0ee29016cb1dd8fcf391a7563eb
2018-04-09 23:48:56 +00:00
