Commit Graph

1978 Commits

Author SHA1 Message Date
Android Merger
38d8d81212 Merge changes from topic "am-dd7b05d27e59420687cc02c82e51669b" am: 7898d269e2
am: 9b40813361

Change-Id: I80dd1fb1ace8d0fb26597957926e4de58b288615
2018-01-12 00:21:49 +00:00
Adam Vartanian
b59215308a DO NOT MERGE Add CTS test for URI fix. am: a02bbf31c4 -s ours am: 50ec90be8d -s ours am: d5544e43e2 -s ours
am: 16488117dc

Change-Id: Iad1dd95c87dd38c8162c07f894245410890d1949
2018-01-12 00:18:44 +00:00
Adam Vartanian
8c7a6a49d9 Merge changes from topic "m" into oreo-cts-dev am: f40fcd461a am: db64de57e0 am: 324e609466
am: 30ef978202

Change-Id: I77e27414e6e074d10c1a77527065c91284075c6c
2018-01-11 23:14:40 +00:00
Adam Vartanian
d312f113cd DO NOT MERGE Add CTS test for URI fix. am: a02bbf31c4 -s ours am: ad0b72a35f am: 47f89788d7
am: 3746042fc5

Change-Id: Iedcf2ec07bbee9d18a64e6dbd4c6948480df76fc
2018-01-11 23:11:02 +00:00
Adam Vartanian
30ef978202 Merge changes from topic "m" into oreo-cts-dev am: f40fcd461a am: db64de57e0
am: 324e609466

Change-Id: I2a5755043a4a3c81317e656b0cb4ac1d763fbed3
2018-01-11 23:09:13 +00:00
Adam Vartanian
3746042fc5 DO NOT MERGE Add CTS test for URI fix. am: a02bbf31c4 -s ours am: ad0b72a35f
am: 47f89788d7

Change-Id: I339aa2297ccd7bad2811ec21a4bbe62d7d2fcf1d
2018-01-11 23:07:05 +00:00
Adam Vartanian
324e609466 Merge changes from topic "m" into oreo-cts-dev am: f40fcd461a
am: db64de57e0

Change-Id: I10da440bcd3160bbef588aa34bea68f030f10cc3
2018-01-11 23:02:46 +00:00
Android Merger
7898d269e2 Merge changes from topic "am-dd7b05d27e59420687cc02c82e51669b"
* changes:
  Merge changes from topic "am-19d0b20ea6e84d16b2530475ea505475" into oreo-mr1-cts-dev am: d1f18aeba3
  DO NOT MERGE Add CTS test for URI fix. am: a02bbf31c4  -s ours am: 50ec90be8d  -s ours
2018-01-11 23:00:21 +00:00
Adam Vartanian
47f89788d7 DO NOT MERGE Add CTS test for URI fix. am: a02bbf31c4 -s ours
am: ad0b72a35f

Change-Id: I05c2d8d1f16fd20991d72765fd960695c40e4fcf
2018-01-11 22:59:35 +00:00
Android Merger
57102570f9 Merge changes from topic "am-19d0b20ea6e84d16b2530475ea505475" into oreo-mr1-cts-dev
am: d1f18aeba3

Change-Id: I7e821c20149cd8ee205cac778b7cbb3e9328208f
2018-01-11 22:59:34 +00:00
Adam Vartanian
d5544e43e2 DO NOT MERGE Add CTS test for URI fix. am: a02bbf31c4 -s ours
am: 50ec90be8d  -s ours

Change-Id: Ifcf62d3d2b4e46734419677980da68bcaf9c6f45
2018-01-11 22:56:22 +00:00
Adam Vartanian
db64de57e0 Merge changes from topic "m" into oreo-cts-dev
am: f40fcd461a

Change-Id: I94fd78a459738c16a7aa25425eacef5a4bda4de6
2018-01-11 22:54:47 +00:00
Adam Vartanian
ad0b72a35f DO NOT MERGE Add CTS test for URI fix.
am: a02bbf31c4  -s ours

Change-Id: Ie6deaf23a60a51cae1fc5441006649134640e44b
2018-01-11 22:54:29 +00:00
Android Merger
d1f18aeba3 Merge changes from topic "am-19d0b20ea6e84d16b2530475ea505475" into oreo-mr1-cts-dev
* changes:
  Merge changes from topic "m" into oreo-cts-dev am: f40fcd461a
  DO NOT MERGE Add CTS test for URI fix. am: a02bbf31c4  -s ours
2018-01-11 22:49:57 +00:00
Adam Vartanian
6f17d12ef2 Merge changes from topic "m" into oreo-cts-dev
am: f40fcd461a

Change-Id: I6e655eb47f304d5d7eccbd20a68dd57a4b25cc95
2018-01-11 22:49:26 +00:00
Adam Vartanian
50ec90be8d DO NOT MERGE Add CTS test for URI fix.
am: a02bbf31c4  -s ours

Change-Id: Ia1abdeb4be51aa8cfd7c4b15cba878887f2b539e
2018-01-11 22:49:06 +00:00
Treehugger Robot
f40fcd461a Merge changes from topic "m" into oreo-cts-dev
* changes:
  DO NOT MERGE Add CTS test for URI fix.
  DO NOT MERGE Verify b/67737022 fix presence
  DO NOT MERGE Add EffectBundleTest
  DO NOT MERGE resolve merge conflicts of 4e1d862763 to mnc-dev
  DO NOT MERGE Test that createBitmap(65535,65535) throws OOME
  DO NOT MERGE Add CTS test for cve_2017_0852_b_62815506
  DO NOT MERGE Add new test type to StagefrightTest
2018-01-11 22:42:43 +00:00
Chenbo Feng
9e998c4312 Merge "Check kernel version before running qtaguid test" am: 3b38b58b1f
am: 6563bb9f75

Change-Id: I59ce2ab48b525e6fd6328bb259fe6b720b500925
2018-01-11 21:33:11 +00:00
Treehugger Robot
3b38b58b1f Merge "Check kernel version before running qtaguid test" 2018-01-11 21:18:47 +00:00
Chenbo Feng
3a9e2dc232 Check kernel version before running qtaguid test
The qtaguid module is required for devices running kernel earlier then
4.9, but is no longer avaliable after that. Add a check before running
the kernel qtaguid native test so it doesn't fail on new devices.

Bug: 30950746
Test: run cts -m CtsNativeNetTestCases
Change-Id: I32bc77a4c51d8b64ac1a5411c75c56a51b84ea77
2018-01-11 11:15:06 -08:00
Adam Vartanian
c9b54a0300 Merge changes from topic "mm" into marshmallow-cts-dev am: 2996702607 am: 3f2c592c8d am: b7279d7562 am: 017cac1442 am: 782f3283ab am: a7461df68d am: 30b0aafe67 am: 1c1e1188b8 am: 6c9e5f4147 am: 17f865e508 am: 4ccdfd28cf am: 26bea30c7a
am: bca7ba675c

Change-Id: I1aeef2900025290bc66e77fd776c8f2a1800eacb
2018-01-10 21:56:20 +00:00
Adam Vartanian
ed0e832254 DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db -s ours am: 8db54315a0 am: c0411106a9 am: 6f4857d900 am: b1969e0aa9 -s ours am: abd196715f am: d18aefffcf am: d1d09b39d9 am: a49852f69d am: 67b508b029 -s ours am: 0f7b85edfa am: 48cde7b920
am: 32f35ba810

Change-Id: I655abe03c7c2b73e4e13525d9f5477e33af2fe69
2018-01-10 21:53:24 +00:00
Adam Vartanian
bca7ba675c Merge changes from topic "mm" into marshmallow-cts-dev am: 2996702607 am: 3f2c592c8d am: b7279d7562 am: 017cac1442 am: 782f3283ab am: a7461df68d am: 30b0aafe67 am: 1c1e1188b8 am: 6c9e5f4147 am: 17f865e508 am: 4ccdfd28cf
am: 26bea30c7a

Change-Id: Ic8b5548cb9e283070627f423602dbccf75ea12fb
2018-01-10 21:46:48 +00:00
Android Merger
4fa874ccc5 Merge changes from topic "am-0577043ff24a4117bd4867dedbf2b6df" into nougat-cts-dev am: bc18e7e105 am: bfbc502b70 am: 02489fed37 am: 25b87f5cad am: c0a1334c94 am: 60a61510cd am: 5722d0a4ec am: 4d17676ff1
am: 8aae042e7a

Change-Id: Ic9a4e809ce44b1b6ef11a0cc8a1eae719efea638
2018-01-10 21:44:26 +00:00
Adam Vartanian
32f35ba810 DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db -s ours am: 8db54315a0 am: c0411106a9 am: 6f4857d900 am: b1969e0aa9 -s ours am: abd196715f am: d18aefffcf am: d1d09b39d9 am: a49852f69d am: 67b508b029 -s ours am: 0f7b85edfa
am: 48cde7b920

Change-Id: Ie39124290ae1423cb15022fb4a708929e9258bf1
2018-01-10 21:44:22 +00:00
Adam Vartanian
ef98ca7cab DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db -s ours am: dfbb7a24e1 -s ours am: 8cb75edc3a am: 43aea5638c am: e37b9c0c15 am: 7529662078 am: 4173b8bf71 -s ours am: 6dc8d5cc2f am: b4f3cd6459
am: 8c34694796

Change-Id: I4bcdb0f9bd1dc95c3575e06be19c603d32c26418
2018-01-10 21:41:18 +00:00
Android Build Merger (Role)
b55d1606a5 Merge changes from topic "am-f19c1bc8474a40c18b6f95c5c34b395d" into nyc-mr1-dev am: 2cfab2140f am: 7169916e4f am: bd14f4f4ff am: d82562eb66 am: 1087e79202
am: daeb3054b5

Change-Id: I21a6a5958d616bcfe904937998675bc8f5d8b128
2018-01-10 21:37:13 +00:00
Adam Vartanian
26bea30c7a Merge changes from topic "mm" into marshmallow-cts-dev am: 2996702607 am: 3f2c592c8d am: b7279d7562 am: 017cac1442 am: 782f3283ab am: a7461df68d am: 30b0aafe67 am: 1c1e1188b8 am: 6c9e5f4147 am: 17f865e508
am: 4ccdfd28cf

Change-Id: Ib2932f53b800efe70498bfe8a001eae3427dfded
2018-01-10 21:35:52 +00:00
Adam Vartanian
48cde7b920 DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db -s ours am: 8db54315a0 am: c0411106a9 am: 6f4857d900 am: b1969e0aa9 -s ours am: abd196715f am: d18aefffcf am: d1d09b39d9 am: a49852f69d am: 67b508b029 -s ours
am: 0f7b85edfa

Change-Id: I5ad97178643f1e5cf3df8e2a387e7cffdbb04e6d
2018-01-10 21:33:14 +00:00
Android Merger
8aae042e7a Merge changes from topic "am-0577043ff24a4117bd4867dedbf2b6df" into nougat-cts-dev am: bc18e7e105 am: bfbc502b70 am: 02489fed37 am: 25b87f5cad am: c0a1334c94 am: 60a61510cd am: 5722d0a4ec
am: 4d17676ff1

Change-Id: Ic8aa74bf826f79bbb83b3b1b605d246c3dd1cc2c
2018-01-10 21:30:43 +00:00
Adam Vartanian
8c34694796 DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db -s ours am: dfbb7a24e1 -s ours am: 8cb75edc3a am: 43aea5638c am: e37b9c0c15 am: 7529662078 am: 4173b8bf71 -s ours am: 6dc8d5cc2f
am: b4f3cd6459

Change-Id: I0be62d50b6930bc73fbdf7f7858227e650ffea3f
2018-01-10 21:28:21 +00:00
Adam Vartanian
ee5d92a11d Merge changes from topic "n" into nougat-cts-dev am: a220d6d27d am: c6743de860 am: d58943f9bd am: c6545ebce1 am: 0f3607adf8 am: 09a3a15afe am: a69195c421 am: 589663cb1f
am: a3df139cc7

Change-Id: Ifdd703d663b19f5dd99066d04e9aa9a4f5b2dd06
2018-01-10 21:28:08 +00:00
Adam Vartanian
6ea80d5148 DO NOT MERGE Add CTS test for URI fix. am: 53a9c9bc34 -s ours am: efb0258e08 am: 2c7b1033b8 am: e3542ba9d1 am: e1544712ff am: bc161e0872 -s ours am: 6329a0e2ae am: 7666fbb478
am: 0fc0967340

Change-Id: I605c18081e086bb5ddc1698d8a616c1e99e1c8c9
2018-01-10 21:25:16 +00:00
Adam Vartanian
4ccdfd28cf Merge changes from topic "mm" into marshmallow-cts-dev am: 2996702607 am: 3f2c592c8d am: b7279d7562 am: 017cac1442 am: 782f3283ab am: a7461df68d am: 30b0aafe67 am: 1c1e1188b8 am: 6c9e5f4147
am: 17f865e508

Change-Id: I225e7d2561a6a91c345bbaf802f7c07c3cf91769
2018-01-10 21:23:47 +00:00
Adam Vartanian
0f7b85edfa DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db -s ours am: 8db54315a0 am: c0411106a9 am: 6f4857d900 am: b1969e0aa9 -s ours am: abd196715f am: d18aefffcf am: d1d09b39d9 am: a49852f69d
am: 67b508b029  -s ours

Change-Id: If5c07b70bdcffe6d099b7a2ef3da6dd12635fc97
2018-01-10 21:22:03 +00:00
Android Build Merger (Role)
daeb3054b5 Merge changes from topic "am-f19c1bc8474a40c18b6f95c5c34b395d" into nyc-mr1-dev am: 2cfab2140f am: 7169916e4f am: bd14f4f4ff am: d82562eb66
am: 1087e79202

Change-Id: I7318caa64b57215fcaa4d62990b9f24e9b5ad002
2018-01-10 21:21:41 +00:00
Android Build Merger (Role)
513080c4d3 Merge changes from topic "am-ab809732e70048beb4646f9609db691c" into oc-mr1-dev-plus-aosp
* changes:
  Merge changes from topic "am-a5bc4e54a433400f95783af4f8ba4da2" am: c660e3c3f2 am: f73858ce33
  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 am: 39127a559b  -s ours am: 2181876b7e  -s ours am: 09167ba006
2018-01-10 21:20:52 +00:00
Android Merger
37e7e020fe Merge changes from topic "am-a5bc4e54a433400f95783af4f8ba4da2" am: c660e3c3f2
am: f73858ce33

Change-Id: I871ab2ed32687d2b3c81c72b128d160beee9080f
2018-01-10 21:19:07 +00:00
Android Merger
b74553ee64 Merge changes from topic "am-4532af43002d481bba66a249d6a74576" into nougat-mr1-cts-dev am: f59fbfb5a4 am: a463421450 am: 983bd08331 am: 178f67f69d am: a88a1fed27 am: 7071758bd8
am: 7edafe88ad

Change-Id: Ib3aefd34dc9e0ee3cb29b8b41471e7b67343850e
2018-01-10 21:18:45 +00:00
Android Merger
4d17676ff1 Merge changes from topic "am-0577043ff24a4117bd4867dedbf2b6df" into nougat-cts-dev am: bc18e7e105 am: bfbc502b70 am: 02489fed37 am: 25b87f5cad am: c0a1334c94 am: 60a61510cd
am: 5722d0a4ec

Change-Id: I04deea642cc4cea202436223c407f84683bf2361
2018-01-10 21:17:35 +00:00
Adam Vartanian
a3df139cc7 Merge changes from topic "n" into nougat-cts-dev am: a220d6d27d am: c6743de860 am: d58943f9bd am: c6545ebce1 am: 0f3607adf8 am: 09a3a15afe am: a69195c421
am: 589663cb1f

Change-Id: Ib1a0e60c2271243837ff4bb5a673a5bdbb3cf587
2018-01-10 21:16:55 +00:00
Adam Vartanian
b4f3cd6459 DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db -s ours am: dfbb7a24e1 -s ours am: 8cb75edc3a am: 43aea5638c am: e37b9c0c15 am: 7529662078 am: 4173b8bf71 -s ours
am: 6dc8d5cc2f

Change-Id: I06b6dcbf1393077c67f75979b51bd95cd834a773
2018-01-10 21:15:03 +00:00
Adam Vartanian
12b98db4c3 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 am: 39127a559b -s ours am: 2181876b7e -s ours
am: 09167ba006

Change-Id: I22769728e593d7d5dd8956448306c235b7544567
2018-01-10 21:14:49 +00:00
Adam Vartanian
0fc0967340 DO NOT MERGE Add CTS test for URI fix. am: 53a9c9bc34 -s ours am: efb0258e08 am: 2c7b1033b8 am: e3542ba9d1 am: e1544712ff am: bc161e0872 -s ours am: 6329a0e2ae
am: 7666fbb478

Change-Id: I5922270f1b0bd300db1bbe874574a580766a1a8b
2018-01-10 21:14:14 +00:00
Adam Vartanian
abf05416b9 DO NOT MERGE Add CTS test for URI fix. am: 53a9c9bc34 -s ours am: 175d980772 -s ours am: bf44542d59 am: 9d37478448 am: f927fe1b92 -s ours am: 9dcd9abb3e am: b33a9da44e
am: fe6272b12e

Change-Id: I37781e2ea22d5cefe80646692b8863e189bbc3c1
2018-01-10 21:13:17 +00:00
Android Merger
5722d0a4ec Merge changes from topic "am-0577043ff24a4117bd4867dedbf2b6df" into nougat-cts-dev am: bc18e7e105 am: bfbc502b70 am: 02489fed37 am: 25b87f5cad am: c0a1334c94
am: 60a61510cd

Change-Id: I7a8a2d7c487fbfd20885dd00e3606d1d5c8777a9
2018-01-10 21:02:13 +00:00
Adam Vartanian
6dc8d5cc2f DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db -s ours am: dfbb7a24e1 -s ours am: 8cb75edc3a am: 43aea5638c am: e37b9c0c15 am: 7529662078
am: 4173b8bf71  -s ours

Change-Id: I6093940b82b4e530332665731c56905a2c1c891a
2018-01-10 21:00:27 +00:00
Android Build Merger (Role)
11c9381256 Merge changes from topic "am-78d56b92e8374ea69d3020f927cd3a08" into oc-mr1-dev-plus-aosp
* changes:
  Merge changes from topic "am-19e9244725df4b0eb80716c24e59ab9c" am: 420c69b8a1 am: 688b3f537e
  DO NOT MERGE Add CTS test for URI fix. am: 53a9c9bc34  -s ours am: 175d980772  -s ours am: df249cbcbb  -s ours am: cebea26b62  -s ours am: e104b8132d  -s ours am: afbc49ee96
2018-01-10 20:52:17 +00:00
Adam Vartanian
6c9e5f4147 Merge changes from topic "mm" into marshmallow-cts-dev am: 2996702607 am: 3f2c592c8d am: b7279d7562 am: 017cac1442 am: 782f3283ab am: a7461df68d am: 30b0aafe67
am: 1c1e1188b8

Change-Id: I8378e67499eef036024ead9bb80a2ec46c1284bf
2018-01-10 20:46:27 +00:00
Adam Vartanian
a49852f69d DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db -s ours am: 8db54315a0 am: c0411106a9 am: 6f4857d900 am: b1969e0aa9 -s ours am: abd196715f am: d18aefffcf
am: d1d09b39d9

Change-Id: I4f0e6b89262f102756919467ec47786146ddbd7b
2018-01-10 20:44:45 +00:00