Android Merger
f2b8d031ab
Merge changes from topic "am-a8c42e83471740dd9885d0dcccdf8907" into oreo-cts-dev
...
am: afff62b0b9
Change-Id: I0ffdf433f50d14f9b2000eba363e5252a2b3e93d
2018-01-10 19:40:26 +00:00
Adam Vartanian
ec320be2b3
DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db -s ours am: dfbb7a24e1 -s ours am: d9ac06f2c2 -s ours
...
am: bdf5a47c67 -s ours
Change-Id: I26d7d4dd3d6eb4ef7d91b302911b8f848dcd1931
2018-01-10 19:39:50 +00:00
Android Merger
b14f56b2c3
Merge changes from topic "am-0166235977bf44ffa6da136c3f46f686" into oreo-cts-dev
...
am: d9aadde604
Change-Id: I9a9f644d102fb0bf576806a450fcb70bfc428ddb
2018-01-10 19:29:47 +00:00
Adam Vartanian
2ff1dfc44f
DO NOT MERGE Add CTS test for URI fix. am: 53a9c9bc34 -s ours am: 175d980772 -s ours
...
am: df249cbcbb -s ours
Change-Id: I805acab23406098716c465c6711a95a4845e17b6
2018-01-10 19:29:14 +00:00
Android Merger
afff62b0b9
Merge changes from topic "am-a8c42e83471740dd9885d0dcccdf8907" into oreo-cts-dev
...
* changes:
Merge changes from topic "am-7882172707e5453d9160ca56a0a63ffc" into nougat-mr1-cts-dev am: 293664a1fb
DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db -s ours am: dfbb7a24e1 -s ours am: d9ac06f2c2 -s ours
2018-01-10 19:26:23 +00:00
Android Merger
865adee70d
Merge changes from topic "am-7882172707e5453d9160ca56a0a63ffc" into nougat-mr1-cts-dev
...
am: 293664a1fb
Change-Id: I4fb988a1a18189c4dd34d2154b42be227d346c82
2018-01-10 19:25:56 +00:00
Adam Vartanian
bdf5a47c67
DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db -s ours am: dfbb7a24e1 -s ours
...
am: d9ac06f2c2 -s ours
Change-Id: I65c91a852c2e7f580a2b58098786b9e39d380d10
2018-01-10 19:23:29 +00:00
Android Merger
1858de921d
Merge changes from topic "am-6b57b7386ef246a589ff8148ff9eae8b" into oreo-cts-dev
...
am: fa209394f0
Change-Id: Ib97632986b715e1ae2148287d0d6d530bb5124ad
2018-01-10 19:23:08 +00:00
Adam Vartanian
7ae5d30389
DO NOT MERGE Add CTS test for URI fix. am: 08044f045c -s ours
...
am: 7955a4e8d8 -s ours
Change-Id: I38ba41fa89303dad989c86bba8fd0ba8bf0e1b13
2018-01-10 19:22:38 +00:00
Android Merger
293664a1fb
Merge changes from topic "am-7882172707e5453d9160ca56a0a63ffc" into nougat-mr1-cts-dev
...
* changes:
Merge changes from topic "am-0577043ff24a4117bd4867dedbf2b6df" into nougat-cts-dev am: bc18e7e105
DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db -s ours am: dfbb7a24e1 -s ours
2018-01-10 19:18:17 +00:00
Android Merger
c0b039c346
Merge changes from topic "am-0577043ff24a4117bd4867dedbf2b6df" into nougat-cts-dev
...
am: bc18e7e105
Change-Id: I383d04d335a27c522758b7838f124333822c5e02
2018-01-10 19:17:53 +00:00
Adam Vartanian
d9ac06f2c2
DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db -s ours
...
am: dfbb7a24e1 -s ours
Change-Id: I802ec14db281665d47ae01ab90b0f8797237a2f2
2018-01-10 19:16:50 +00:00
Android Merger
d9aadde604
Merge changes from topic "am-0166235977bf44ffa6da136c3f46f686" into oreo-cts-dev
...
* changes:
Merge changes from topic "am-4532af43002d481bba66a249d6a74576" into nougat-mr1-cts-dev am: f59fbfb5a4
DO NOT MERGE Add CTS test for URI fix. am: 53a9c9bc34 -s ours am: 175d980772 -s ours
2018-01-10 19:15:20 +00:00
Android Merger
c8d546b3ab
Merge changes from topic "am-4532af43002d481bba66a249d6a74576" into nougat-mr1-cts-dev
...
am: f59fbfb5a4
Change-Id: I845720eea2e308e886afd2c900f66bfdff24679d
2018-01-10 19:14:50 +00:00
Android Merger
bc18e7e105
Merge changes from topic "am-0577043ff24a4117bd4867dedbf2b6df" into nougat-cts-dev
...
* changes:
Merge changes from topic "mm" into marshmallow-cts-dev am: 2996702607
DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db -s ours
2018-01-10 19:13:47 +00:00
Adam Vartanian
2ba7ef5b48
Merge changes from topic "mm" into marshmallow-cts-dev
...
am: 2996702607
Change-Id: I210f8b36685e9e1dbcc2916b921501ed55ddb1fb
2018-01-10 19:13:07 +00:00
Adam Vartanian
df249cbcbb
DO NOT MERGE Add CTS test for URI fix. am: 53a9c9bc34 -s ours
...
am: 175d980772 -s ours
Change-Id: I9f2de682ef6178fa6c58781e393f53b96ccb2e1e
2018-01-10 19:12:57 +00:00
Adam Vartanian
dfbb7a24e1
DO NOT MERGE Add CTS test for URI fix.
...
am: 1efb5151db -s ours
Change-Id: I7cb28b5ac56f616a23a99d466606da8221eaa58e
2018-01-10 19:12:49 +00:00
Android Merger
fa209394f0
Merge changes from topic "am-6b57b7386ef246a589ff8148ff9eae8b" into oreo-cts-dev
...
* changes:
Merge changes from topic "n1" into nougat-mr1-cts-dev am: 76faaa3996
DO NOT MERGE Add CTS test for URI fix. am: 08044f045c -s ours
2018-01-10 19:11:25 +00:00
Adam Vartanian
f93369d103
Merge changes from topic "n1" into nougat-mr1-cts-dev
...
am: 76faaa3996
Change-Id: I8c07170ab322c1ea8d40df9302733132a604b0c9
2018-01-10 19:10:54 +00:00
Adam Vartanian
7955a4e8d8
DO NOT MERGE Add CTS test for URI fix.
...
am: 08044f045c -s ours
Change-Id: I41b3f407c0e7714b80e935fb7ae556a2558cd143
2018-01-10 19:10:30 +00:00
Android Merger
f59fbfb5a4
Merge changes from topic "am-4532af43002d481bba66a249d6a74576" into nougat-mr1-cts-dev
...
* changes:
Merge changes from topic "n" into nougat-cts-dev am: a220d6d27d
DO NOT MERGE Add CTS test for URI fix. am: 53a9c9bc34 -s ours
2018-01-10 19:08:34 +00:00
Adam Vartanian
0aa1444c8e
Merge changes from topic "n" into nougat-cts-dev
...
am: a220d6d27d
Change-Id: I406953a4713b768012d123a33db06268e8cf3799
2018-01-10 19:07:44 +00:00
Adam Vartanian
175d980772
DO NOT MERGE Add CTS test for URI fix.
...
am: 53a9c9bc34 -s ours
Change-Id: I1402f70414d6ba6b89224d37af32bbe47157d1b5
2018-01-10 19:07:26 +00:00
Treehugger Robot
76faaa3996
Merge changes from topic "n1" into nougat-mr1-cts-dev
...
* changes:
DO NOT MERGE Add CTS test for URI fix.
DO NOT MERGE Add EffectBundleTest
DO NOT MERGE resolve merge conflicts of 4e1d862763 to mnc-dev
DO NOT MERGE Add CTS test for cve_2017_0852_b_62815506
2018-01-10 19:06:35 +00:00
Treehugger Robot
2996702607
Merge changes from topic "mm" into marshmallow-cts-dev
...
* changes:
DO NOT MERGE Add CTS test for URI fix.
DO NOT MERGE Add EffectBundleTest
DO NOT MERGE resolve merge conflicts of 4e1d862763 to mnc-dev
DO NOT MERGE Add CTS test for cve_2017_0852_b_62815506
2018-01-10 19:05:55 +00:00
Treehugger Robot
a220d6d27d
Merge changes from topic "n" into nougat-cts-dev
...
* changes:
DO NOT MERGE Add CTS test for URI fix.
DO NOT MERGE Add EffectBundleTest
DO NOT MERGE resolve merge conflicts of 4e1d862763 to mnc-dev
DO NOT MERGE Add CTS test for cve_2017_0852_b_62815506
2018-01-10 18:59:52 +00:00
Adam Vartanian
08044f045c
DO NOT MERGE Add CTS test for URI fix.
...
Bug: 68341964
Test: cts -m CtsNetTestCases (on NYC branch)
Change-Id: If532123542155ea3be281044a3ea4ca0b6cf2db5
(cherry picked from commit a01da8536c )
2018-01-08 13:31:30 -08:00
Adam Vartanian
53a9c9bc34
DO NOT MERGE Add CTS test for URI fix.
...
Bug: 68341964
Test: cts -m CtsNetTestCases (on NYC branch)
Change-Id: If532123542155ea3be281044a3ea4ca0b6cf2db5
(cherry picked from commit a01da8536c )
2018-01-08 12:57:18 -08:00
Adam Vartanian
1efb5151db
DO NOT MERGE Add CTS test for URI fix.
...
Bug: 68341964
Test: cts -m CtsNetTestCases (on NYC branch)
Change-Id: If532123542155ea3be281044a3ea4ca0b6cf2db5
(cherry picked from commit a01da8536c )
2018-01-08 12:52:51 -08:00
Adam Vartanian
3d7e43b226
Add CTS test for URI fix. am: a01da8536c am: b1b5379591 am: 73105d42aa am: c210cc1a90 am: 5d8ba63f42 am: e88ef1b832 am: 1e1de4f052 am: 2204809646 am: fb73667810 am: 83f1303285
...
am: f259a8e37a
Change-Id: Iaf798faba75cb1f543e012eee98707e20a08e8ce
2017-11-07 23:41:55 +00:00
Adam Vartanian
83f1303285
Add CTS test for URI fix. am: a01da8536c am: b1b5379591 am: 73105d42aa am: c210cc1a90 am: 5d8ba63f42 am: e88ef1b832 am: 1e1de4f052 am: 2204809646
...
am: fb73667810
Change-Id: Ib6d1cc2531123894f917b13d388845164e6eec32
2017-11-07 22:56:57 +00:00
Adam Vartanian
fb73667810
Add CTS test for URI fix. am: a01da8536c am: b1b5379591 am: 73105d42aa am: c210cc1a90 am: 5d8ba63f42 am: e88ef1b832 am: 1e1de4f052
...
am: 2204809646
Change-Id: Ic96d9b4693178421303c45ac628c456b66cdf655
2017-11-07 22:35:33 +00:00
Adam Vartanian
2204809646
Add CTS test for URI fix. am: a01da8536c am: b1b5379591 am: 73105d42aa am: c210cc1a90 am: 5d8ba63f42 am: e88ef1b832
...
am: 1e1de4f052
Change-Id: I4153cfa021655ba19b4b6dca19b70aaf91b5caa8
2017-11-07 22:08:32 +00:00
Adam Vartanian
1e1de4f052
Add CTS test for URI fix. am: a01da8536c am: b1b5379591 am: 73105d42aa am: c210cc1a90 am: 5d8ba63f42
...
am: e88ef1b832
Change-Id: Ie60c0885bc52b26fa900d2908946a56169d2f04c
2017-11-07 21:52:12 +00:00
Adam Vartanian
5d8ba63f42
Add CTS test for URI fix. am: a01da8536c am: b1b5379591 am: 73105d42aa
...
am: c210cc1a90
Change-Id: I276a0be85c41f823506fc8397050d406257324e9
2017-11-07 21:26:57 +00:00
Adam Vartanian
73105d42aa
Add CTS test for URI fix. am: a01da8536c
...
am: b1b5379591
Change-Id: Ib1bcf1c84ee878161f812e8a9ba762a746329a3b
2017-11-07 20:49:55 +00:00
Adam Vartanian
b1b5379591
Add CTS test for URI fix.
...
am: a01da8536c
Change-Id: I21c707648e6cc02b267f663bd02140dd66b6bd80
2017-11-07 20:40:20 +00:00
Adam Vartanian
a01da8536c
Add CTS test for URI fix.
...
Bug: 68341964
Test: cts -m CtsNetTestCases (on NYC branch)
Change-Id: If532123542155ea3be281044a3ea4ca0b6cf2db5
2017-11-07 14:02:08 +00:00
Etan Cohen
8e699c86fc
Merge "[CTS][PASSPOINT] Update the check for passpoint network for preloaded passpoint network" into oreo-cts-dev
...
am: d5c00ceee0
Change-Id: I9b42b412355a641f2bb8a06f031fced7575bab44
2017-10-24 17:57:29 +00:00
Treehugger Robot
d5c00ceee0
Merge "[CTS][PASSPOINT] Update the check for passpoint network for preloaded passpoint network" into oreo-cts-dev
2017-10-24 17:50:46 +00:00
Etan Cohen
591518f378
[CTS][PASSPOINT] Update the check for passpoint network for preloaded passpoint network
...
Before calling the testAddPasspointConfigWithCertCredential
we need to check number of network already present in device
Bug: 67630919
Test: android.server.cts.CtsNetTestCases, WifiManagerTest
Change-Id: If643ab7bde760a65e9a5b1e9d47af53378a178fd
2017-10-23 23:07:59 +00:00
Sudheer Shanka
8ca874ff80
Merge "Increase timeout for ordered broadcast response." into nougat-cts-dev am: 203361a0c3 am: 662e13b57a am: 46f8aa6d48 am: 7cbb2f7587 am: b3b2ee88cd
...
am: c4e9bdc085 -s ours
Change-Id: I1ddc2ab2fb8c80d9455b7ee15e7fa4e929517c7a
2017-09-07 18:43:52 +00:00
Sudheer Shanka
384309dea0
Merge "Merge "Increase timeout for ordered broadcast response." into nougat-cts-dev am: 203361a0c3" into nougat-mr1-cts-dev am: b5abc8f89b am: f0bc6efb5e am: be2d3c2871
...
am: c0c353f6d2 -s ours
Change-Id: Id8af45c896241c03d9ca43f9cd5825e77ffe6563
2017-09-07 18:35:44 +00:00
Sudheer Shanka
b3b2ee88cd
Merge "Increase timeout for ordered broadcast response." into nougat-cts-dev am: 203361a0c3 am: 662e13b57a am: 46f8aa6d48
...
am: 7cbb2f7587
Change-Id: Idc1174d25aecef3bb5461d22a6d2bcf3fdf6bed3
2017-09-07 18:29:40 +00:00
Sudheer Shanka
7cbb2f7587
Merge "Increase timeout for ordered broadcast response." into nougat-cts-dev am: 203361a0c3 am: 662e13b57a
...
am: 46f8aa6d48
Change-Id: If6fb0012849a0b95344fa4ed5f2e3985340a03a1
2017-09-07 18:25:15 +00:00
Sudheer Shanka
be2d3c2871
Merge "Merge "Increase timeout for ordered broadcast response." into nougat-cts-dev am: 203361a0c3" into nougat-mr1-cts-dev am: b5abc8f89b
...
am: f0bc6efb5e
Change-Id: Ic20530cdbae02daf1133500e2778b8829331332b
2017-09-07 18:24:22 +00:00
Sudheer Shanka
054a3b98cb
Merge "Merge "Increase timeout for ordered broadcast response." into nougat-cts-dev am: 203361a0c3" into nougat-mr1-cts-dev am: b5abc8f89b -s ours
...
am: b411a9d3c1 -s ours
Change-Id: Iaaaa496a0b092e48d7acf7901a40e9767efedba6
2017-09-07 18:23:09 +00:00
Sudheer Shanka
46f8aa6d48
Merge "Increase timeout for ordered broadcast response." into nougat-cts-dev am: 203361a0c3
...
am: 662e13b57a
Change-Id: I0d070bfbe19666f77b9ae21c19893f776389fac0
2017-09-07 18:20:35 +00:00
Sudheer Shanka
b411a9d3c1
Merge "Merge "Increase timeout for ordered broadcast response." into nougat-cts-dev am: 203361a0c3" into nougat-mr1-cts-dev
...
am: b5abc8f89b -s ours
Change-Id: I6e63b41e0a0c499aeeab069da4666c4f42a18fc9
2017-09-07 18:19:13 +00:00