Commit Graph

1960 Commits

Author SHA1 Message Date
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
Android Merger
d9e3b064ef Merge changes from topic "am-19e9244725df4b0eb80716c24e59ab9c" am: 420c69b8a1
am: 688b3f537e

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

Change-Id: I6557e64522cc303971d8adfa5e2261fb89e1176a
2018-01-10 20:40:02 +00:00
Android Merger
7edafe88ad Merge changes from topic "am-4532af43002d481bba66a249d6a74576" into nougat-mr1-cts-dev am: f59fbfb5a4 am: a463421450 am: 983bd08331 am: 178f67f69d am: a88a1fed27
am: 7071758bd8

Change-Id: I72ec5e42fc9567cb1d752843a836ae3a63768d4a
2018-01-10 20:39:44 +00:00
Android Build Merger (Role)
0fe0808a01 Merge changes from topic "am-177bacee3d764303895ed5e1e72bf859" into oc-dev am: 2f8017a25a am: 5af7a7290f
am: 09f933b601

Change-Id: I93f6940b389d1f75701ef3c5e3ce7877a71d9618
2018-01-10 20:39:31 +00:00
Adam Vartanian
e1e9960037 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

Change-Id: I8596849988ad71dbc0227efdf0bd8728c516eaba
2018-01-10 20:37:25 +00:00
Adam Vartanian
fe6272b12e 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

Change-Id: I600432be7175660b15ca534d37a8f6d74e0ca947
2018-01-10 20:37:02 +00:00
Android Merger
9426ada6fd Merge changes from topic "am-a8c42e83471740dd9885d0dcccdf8907" into oreo-cts-dev am: afff62b0b9 am: f2b8d031ab am: 0be73f463a
am: 91e08510b1

Change-Id: Iade4494707b66e92989587b5cfb6be89e001d59c
2018-01-10 20:34:52 +00:00
Adam Vartanian
589663cb1f Merge changes from topic "n" into nougat-cts-dev am: a220d6d27d am: c6743de860 am: d58943f9bd am: c6545ebce1 am: 0f3607adf8 am: 09a3a15afe
am: a69195c421

Change-Id: Ibf9e2d0d2100e3636ef3b837c36eef18143efac4
2018-01-10 20:34:21 +00:00
Adam Vartanian
1c1e1188b8 Merge changes from topic "mm" into marshmallow-cts-dev am: 2996702607 am: 3f2c592c8d am: b7279d7562 am: 017cac1442 am: 782f3283ab am: a7461df68d
am: 30b0aafe67

Change-Id: I9474a516750548db3e35cde1175a3585dd8b5a50
2018-01-10 20:34:19 +00:00
Adam Vartanian
d1d09b39d9 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

Change-Id: I7c8519b6a1a747d2e104f5a9b349e2607906bdb5
2018-01-10 20:32:57 +00:00
Adam Vartanian
7666fbb478 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

Change-Id: Id9c6293718ad177e0c908df27a554c9f82f3b360
2018-01-10 20:32:02 +00:00
Adam Vartanian
03782ea6ef 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: ec320be2b3 am: 2ef4392dc8
am: ddd7efeef4

Change-Id: I545a809a12349d5fde77a17526ba1772bf8fb2d1
2018-01-10 20:30:07 +00:00
Android Build Merger (Role)
d82562eb66 Merge changes from topic "am-f19c1bc8474a40c18b6f95c5c34b395d" into nyc-mr1-dev am: 2cfab2140f am: 7169916e4f
am: bd14f4f4ff

Change-Id: I6811725aa66fb6c10e39c1c675c2dcac0a5dcd6a
2018-01-10 20:27:08 +00:00
Android Merger
7071758bd8 Merge changes from topic "am-4532af43002d481bba66a249d6a74576" into nougat-mr1-cts-dev am: f59fbfb5a4 am: a463421450 am: 983bd08331 am: 178f67f69d
am: a88a1fed27

Change-Id: I309be2935d5001a107507a36adff25d97c6c5a8c
2018-01-10 20:25:40 +00:00
Android Build Merger (Role)
09f933b601 Merge changes from topic "am-177bacee3d764303895ed5e1e72bf859" into oc-dev am: 2f8017a25a
am: 5af7a7290f

Change-Id: I49efdb80338f5a1638e4a147d33c73892ddff957
2018-01-10 20:25:34 +00:00
Adam Vartanian
b33a9da44e 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

Change-Id: I03e9ef4c6eabdb0466728358342a45b29f5eb313
2018-01-10 20:23:36 +00:00
Android Build Merger (Role)
1f8146c8f0 Merge changes from topic "am-fda3e51b99ba472293e34273b3249d2c" into oc-mr1-dev-plus-aosp
* changes:
  Merge changes from topic "am-4a80c23f3c6c420e98f1331a523bf986" am: 7aa66922dd am: 3d5a649ea6
  DO NOT MERGE Add CTS test for URI fix. am: 08044f045c  -s ours am: 7955a4e8d8  -s ours am: d89f75a3db  -s ours am: db4ab12068  -s ours am: 7c6875bef1
2018-01-10 20:20:52 +00:00