Commit Graph

1901 Commits

Author SHA1 Message Date
Ray Essick
4f668aaf31 Merge changes from topic "am-577c7e51c7294d17a1c29c24e9664b0a" into oreo-mr1-cts-dev
am: 666f941b5a

Change-Id: I93160ff6bf44b8d186f86e0c54ea463df48dbfc5
2018-04-09 16:19:21 -07:00
Ray Essick
14b3dd4079 [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 8a0f955e56 -s ours am: 8dd2d10a1b -s ours
am: f3d4af802c  -s ours

Change-Id: Ie1ce0237b3eed4b170a4cf87e0387ce7aaac4673
2018-04-09 16:18:39 -07:00
Ray Essick
b5c3d08260 Merge changes from topic "asb-2018-04-o1" into oreo-mr1-cts-dev
am: f5e53a396f

Change-Id: I03ecdfbb20e5b882332e7a018fed9b6969990974
2018-04-09 16:13:03 -07:00
Ray Essick
2a60c1ea48 [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454
am: ac5b691121  -s ours

Change-Id: I68bd2d8587558b601681d0a46b22c6f30cb9fa62
2018-04-09 16:12:37 -07:00
Android Merger
666f941b5a Merge changes from topic "am-577c7e51c7294d17a1c29c24e9664b0a" into oreo-mr1-cts-dev
* changes:
  Merge changes from topic "am-a984919964a248a18190aca22d4db916" into oreo-cts-dev am: 0eeb6c53d1
  [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 8a0f955e56  -s ours am: 8dd2d10a1b  -s ours
2018-04-09 22:38:18 +00:00
Treehugger Robot
f5e53a396f Merge changes from topic "asb-2018-04-o1" into oreo-mr1-cts-dev
* changes:
  DO NOT MERGE CTS for presence of avc fix for b/70897454
  DO NOT MERGE Add CTS test for URI fix.
  DO NOT MERGE CTS additions for b/72165027
  DO NOT MERGE CTS tests for b/70897394
  DO NOT MERGE Camera: Add test for OutputConfiguration parcelling
2018-04-09 22:37:33 +00:00
Ray Essick
a0de7cb873 Merge changes from topic "am-a984919964a248a18190aca22d4db916" into oreo-cts-dev
am: 0eeb6c53d1

Change-Id: I999d875a15b9a037165e4782f285a591334b4daf
2018-04-09 15:37:30 -07:00
Ray Essick
f3d4af802c [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 8a0f955e56 -s ours
am: 8dd2d10a1b  -s ours

Change-Id: I3b2cc560a4b664399a742d4301304dcf3e99f6ed
2018-04-09 15:35:30 -07:00
Android Merger
0eeb6c53d1 Merge changes from topic "am-a984919964a248a18190aca22d4db916" into oreo-cts-dev
* changes:
  Merge changes from topic "asb-2018-04-n1" into nougat-mr1-cts-dev am: 34ef78f44f
  [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 8a0f955e56  -s ours
2018-04-09 22:28:05 +00:00
Ray Essick
a1d6d60e04 Merge changes from topic "asb-2018-04-n1" into nougat-mr1-cts-dev
am: 34ef78f44f

Change-Id: I7077de030a59695ea3c1c8d99aa0b5aea3a8ef8a
2018-04-09 15:27:50 -07:00
Ray Essick
8dd2d10a1b [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454
am: 8a0f955e56  -s ours

Change-Id: Ib3da591114c4022fb94114f768d0ecf3f5c106b1
2018-04-09 15:27:27 -07:00
Treehugger Robot
34ef78f44f Merge changes from topic "asb-2018-04-n1" into nougat-mr1-cts-dev
* changes:
  DO NOT MERGE CTS for presence of avc fix for b/70897454
  DO NOT MERGE Add CTS test for URI fix.
  DO NOT MERGE CTS additions for b/72165027
  DO NOT MERGE CTS tests for b/70897394
2018-04-09 22:21:52 +00:00
Adam Vartanian
31786e4612 DO NOT MERGE Add CTS test for URI fix.
Bug: 71360761
Test: cts -m CtsNetTestCases (on NYC branch)
Change-Id: I09a156040d4970b7b2f973e9bffcfc97a8ff2274
(cherry picked from commit 85156429a2)
2018-04-09 14:50:16 -07:00
Adam Vartanian
55c6004dfd DO NOT MERGE Add CTS test for URI fix.
Bug: 71360761
Test: cts -m CtsNetTestCases (on NYC branch)
Change-Id: I09a156040d4970b7b2f973e9bffcfc97a8ff2274
(cherry picked from commit 85156429a2)
2018-04-09 14:46:11 -07:00
Adam Vartanian
bbc39aba5b Merge changes from topic "am-325cd506-a538-4cb7-a65c-bc30576c59e9" into oc-dev am: fb27c032ff
am: 3c22d6bea8

Change-Id: I2fe9d75f0bf5b94f2fa0b2d0a819f2b8281ccf7b
2018-02-02 03:32:08 +00:00
Adam Vartanian
3c22d6bea8 Merge changes from topic "am-325cd506-a538-4cb7-a65c-bc30576c59e9" into oc-dev
am: fb27c032ff

Change-Id: I459897b291fff063091f4d5e64330df4ade47c0c
2018-02-01 23:31:51 +00:00
Android Build Merger (Role)
ea75ff0609 [automerger] Add CTS test for URI fix. am: 85156429a2 am: 27914625b1 am: 662ce9724a am: 67ae9d3245 am: ad9fa4877c am: 2f52ceef6f am: 3bc75c3136 am: 1e65404eb8 am: 330b09b8a8 am: 119bbb1cdb
Change-Id: Ib52e5a020d679328e9d91534e636f6f89abb8781
2018-01-31 11:17:54 +00:00
Android Build Merger (Role)
330b09b8a8 [automerger] Add CTS test for URI fix. am: 85156429a2 am: 27914625b1 am: 662ce9724a am: 67ae9d3245 am: ad9fa4877c am: 2f52ceef6f am: 3bc75c3136 am: 1e65404eb8
Change-Id: I0232e8093dd78ed98e9d89ec0c062593b38a12a1
2018-01-31 11:17:45 +00:00
Android Build Merger (Role)
1e65404eb8 [automerger] Add CTS test for URI fix. am: 85156429a2 am: 27914625b1 am: 662ce9724a am: 67ae9d3245 am: ad9fa4877c am: 2f52ceef6f am: 3bc75c3136
Change-Id: I3e58d87b69ba1f32474550364e04324e6fc8fd88
2018-01-31 11:17:39 +00:00
Android Build Merger (Role)
3bc75c3136 [automerger] Add CTS test for URI fix. am: 85156429a2 am: 27914625b1 am: 662ce9724a am: 67ae9d3245 am: ad9fa4877c am: 2f52ceef6f
Change-Id: I164c155385cef9ca2ed8bb810d1c1e7be65e4458
2018-01-31 11:17:34 +00:00
Android Build Merger (Role)
2f52ceef6f [automerger] Add CTS test for URI fix. am: 85156429a2 am: 27914625b1 am: 662ce9724a am: 67ae9d3245 am: ad9fa4877c
Change-Id: Ie5d7744787cd7b700b42dc22ddc921f5b1965a01
2018-01-31 11:17:29 +00:00
Android Build Merger (Role)
67ae9d3245 [automerger] Add CTS test for URI fix. am: 85156429a2 am: 27914625b1 am: 662ce9724a
Change-Id: I29da2e67aa8c3ec9bde0d72c91ada85f160e39d9
2018-01-31 11:17:19 +00:00
Android Build Merger (Role)
27914625b1 [automerger] Add CTS test for URI fix. am: 85156429a2
Change-Id: Iedd07e900b8512737df2d0d6ca33920ef9bfd30b
2018-01-31 11:17:09 +00:00
Adam Vartanian
85156429a2 Add CTS test for URI fix.
Bug: 71360761
Test: cts -m CtsNetTestCases (on NYC branch)
Change-Id: I09a156040d4970b7b2f973e9bffcfc97a8ff2274
2018-01-31 10:47:13 +00:00
Android Build Merger (Role)
20754b2e89 [automerger] Merge changes from topic "am-ce0b82716046454cb0a4f10e2fc1d036" into nougat-mr1-cts-dev am: 5962c9a234 am: b4bfd2591e am: eac2219dc5 am: db6090eaf9 am: 808e81dd22 am: a86c42b38d
Change-Id: I117259585aff22358b01358ae1f7425450851c43
2018-01-17 03:24:07 +00:00
Android Build Merger (Role)
a86c42b38d [automerger] Merge changes from topic "am-ce0b82716046454cb0a4f10e2fc1d036" into nougat-mr1-cts-dev am: 5962c9a234 am: b4bfd2591e am: eac2219dc5 am: db6090eaf9 am: 808e81dd22
Change-Id: I5dd1f11b861143d2dd51ff6feb572550d609a1df
2018-01-17 03:24:03 +00:00
Android Build Merger (Role)
808e81dd22 [automerger] Merge changes from topic "am-ce0b82716046454cb0a4f10e2fc1d036" into nougat-mr1-cts-dev am: 5962c9a234 am: b4bfd2591e am: eac2219dc5 am: db6090eaf9
Change-Id: I6bc6a23c88ad0e6128fc31278f4a206a78652926
2018-01-17 03:23:56 +00:00
Android Build Merger (Role)
eac2219dc5 [automerger] Merge changes from topic "am-ce0b82716046454cb0a4f10e2fc1d036" into nougat-mr1-cts-dev am: 5962c9a234 am: b4bfd2591e
Change-Id: I120eb44d9d2d125a39e126cb352c647957f7c3d6
2018-01-17 03:23:48 +00:00
Android Build Merger (Role)
68e08c6583 [automerger] DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f -s ours am: 181a10e364 -s ours am: 84a9da7ac9 -s ours am: 9dc912e515 -s ours am: 0929932c4e am: 265bcb72d4 skipped: 817433c874 am: 6b4982ab84 am: c5e57d2adf
Change-Id: I1adf2d94f8679852e4fd8ec138dcfd4dbefdf8fa
2018-01-17 03:23:06 +00:00
Android Build Merger (Role)
c5e57d2adf [automerger] DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f -s ours am: 181a10e364 -s ours am: 84a9da7ac9 -s ours am: 9dc912e515 -s ours am: 0929932c4e am: 265bcb72d4 skipped: 817433c874 am: 6b4982ab84
Change-Id: I5ad7437c1666b13a838686bd79e066671f14d7ed
2018-01-17 03:23:03 +00:00
Android Build Merger (Role)
6b4982ab84 [automerger] DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f -s ours am: 181a10e364 -s ours am: 84a9da7ac9 -s ours am: 9dc912e515 -s ours am: 0929932c4e am: 265bcb72d4 skipped: 817433c874
Change-Id: I62e9a641654b924112701fb7c079d32e8c1e9f88
2018-01-17 03:22:57 +00:00
Android Build Merger (Role)
265bcb72d4 [automerger] DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f -s ours am: 181a10e364 -s ours am: 84a9da7ac9 -s ours am: 9dc912e515 -s ours am: 0929932c4e
Change-Id: If961faa8b8cd48133480340db402be74a138351a
2018-01-17 03:22:50 +00:00
Android Merger
b4bfd2591e Merge changes from topic "am-ce0b82716046454cb0a4f10e2fc1d036" into nougat-mr1-cts-dev
am: 5962c9a234

Change-Id: I2193a17eb99173895f9397d18d8361e1eb4568d6
2018-01-17 03:22:22 +00:00
Adam Vartanian
0929932c4e DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f -s ours am: 181a10e364 -s ours am: 84a9da7ac9 -s ours
am: 9dc912e515  -s ours

Change-Id: I08182d4ead353c8fe59d54bac007586c6fa91b1d
2018-01-17 03:19:45 +00:00
Android Build Merger (Role)
234cc79182 [automerger] Merge changes from topic "am-fc4976ef3f1a43da90fcb5b64fad74c0" into nougat-cts-dev am: f582e9dede am: 02c0ecc53d am: af696171be am: b986143870 am: 7f4a3db8e5 am: f6cfb759d4 am: 94583cc2fa am: e477541e10
Change-Id: Ie90dcc7c9cf1a960f2b18555e7071b6efe60ba30
2018-01-17 02:46:21 +00:00
Android Build Merger (Role)
e477541e10 [automerger] Merge changes from topic "am-fc4976ef3f1a43da90fcb5b64fad74c0" into nougat-cts-dev am: f582e9dede am: 02c0ecc53d am: af696171be am: b986143870 am: 7f4a3db8e5 am: f6cfb759d4 am: 94583cc2fa
Change-Id: I86ed0a2bf7ae2ee93cca2d9da3230078e6d77255
2018-01-17 02:46:18 +00:00
Android Build Merger (Role)
94583cc2fa [automerger] Merge changes from topic "am-fc4976ef3f1a43da90fcb5b64fad74c0" into nougat-cts-dev am: f582e9dede am: 02c0ecc53d am: af696171be am: b986143870 am: 7f4a3db8e5 am: f6cfb759d4
Change-Id: I06afa7a3a2607550bf3dcc2a7ec337c92a58fff6
2018-01-17 02:46:11 +00:00
Android Build Merger (Role)
7f4a3db8e5 [automerger] Merge changes from topic "am-fc4976ef3f1a43da90fcb5b64fad74c0" into nougat-cts-dev am: f582e9dede am: 02c0ecc53d am: af696171be am: b986143870
Change-Id: I3844fb6083799d1975c43644b66c69ec5611283e
2018-01-17 02:46:03 +00:00
Android Build Merger (Role)
b986143870 [automerger] Merge changes from topic "am-fc4976ef3f1a43da90fcb5b64fad74c0" into nougat-cts-dev am: f582e9dede am: 02c0ecc53d am: af696171be
Change-Id: I475e52bc05a9a602cb8d99fbf1468832686b69c0
2018-01-17 02:45:59 +00:00
Android Build Merger (Role)
af696171be [automerger] Merge changes from topic "am-fc4976ef3f1a43da90fcb5b64fad74c0" into nougat-cts-dev am: f582e9dede am: 02c0ecc53d
Change-Id: I28da24aaf125a8ada71b760c42e03ad7bef5bfcf
2018-01-17 02:45:55 +00:00
Android Build Merger (Role)
62750670fe [automerger] DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f -s ours am: 181a10e364 -s ours am: 84a9da7ac9 -s ours am: 3ba9598f23 am: a8a391899f am: 16b7318a02 am: bf5ae9c33b skipped: 37335953c6 am: ef964de58b am: a11e751c00
Change-Id: I78fd12e8ae7a1bf78a44b1da8614e8ecd02c7131
2018-01-17 02:45:01 +00:00
Android Build Merger (Role)
a11e751c00 [automerger] DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f -s ours am: 181a10e364 -s ours am: 84a9da7ac9 -s ours am: 3ba9598f23 am: a8a391899f am: 16b7318a02 am: bf5ae9c33b skipped: 37335953c6 am: ef964de58b
Change-Id: I15902a01b93d9cbf13e27fa6ef9376e943b4db5e
2018-01-17 02:44:57 +00:00
Android Build Merger (Role)
ef964de58b [automerger] DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f -s ours am: 181a10e364 -s ours am: 84a9da7ac9 -s ours am: 3ba9598f23 am: a8a391899f am: 16b7318a02 am: bf5ae9c33b skipped: 37335953c6
Change-Id: Ie98a567e52f4366e613a9470010ecc03857433b5
2018-01-17 02:44:51 +00:00
Android Build Merger (Role)
bf5ae9c33b [automerger] DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f -s ours am: 181a10e364 -s ours am: 84a9da7ac9 -s ours am: 3ba9598f23 am: a8a391899f am: 16b7318a02
Change-Id: I2197bc67084542f213abff49139bd333eba63484
2018-01-17 02:44:44 +00:00
Android Build Merger (Role)
16b7318a02 [automerger] DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f -s ours am: 181a10e364 -s ours am: 84a9da7ac9 -s ours am: 3ba9598f23 am: a8a391899f
Change-Id: I7df1041d1cd9f582534af512a99774288d41d4eb
2018-01-17 02:44:40 +00:00
Android Build Merger (Role)
a8a391899f [automerger] DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f -s ours am: 181a10e364 -s ours am: 84a9da7ac9 -s ours am: 3ba9598f23
Change-Id: I4b5d6970b199efd861d25633abd0433446ca1304
2018-01-17 02:44:37 +00:00
Android Merger
02c0ecc53d Merge changes from topic "am-fc4976ef3f1a43da90fcb5b64fad74c0" into nougat-cts-dev
am: f582e9dede

Change-Id: Ie9702984ab2e7a3d90ce0237d5c5593446d4b664
2018-01-17 02:44:23 +00:00
Adam Vartanian
3ba9598f23 DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f -s ours am: 181a10e364 -s ours
am: 84a9da7ac9  -s ours

Change-Id: Ic32802e983f9a464d629873909380682f3fb2c34
2018-01-17 02:42:57 +00:00
Android Merger
57c33efafb Merge changes from topic "am-640962a57b8e46aa8b753bca730fb376" into oreo-mr1-cts-dev
am: 9f63146b7d

Change-Id: Iae91de7c8bc4b14b2be6d99ba2419947215559bd
2018-01-16 22:14:59 +00:00
Adam Vartanian
6f2dd6d138 DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f -s ours am: 181a10e364 -s ours am: 84a9da7ac9 -s ours am: 9dc912e515 -s ours am: ca0bfec15d -s ours
am: 482d1b4a62  -s ours

Change-Id: I3a479db6114a168760591500288ed65a03637782
2018-01-16 22:14:02 +00:00