Commit Graph

2056 Commits

Author SHA1 Message Date
TreeHugger Robot
41bdd1d7b5 Merge "Update PROCESS_STATE_FOREGROUND_SERVICE constant value." 2018-01-12 00:20:12 +00:00
Adam Vartanian
f5c0ea85a8 Merge changes from topic "m" into oreo-cts-dev am: f40fcd461a am: db64de57e0 am: 324e609466 am: 30ef978202
am: 8c7a6a49d9

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

Change-Id: I49a990610584c416d9387f76557a709b4cbcb6b2
2018-01-11 23:26:39 +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
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
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
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
0f27294a76 Merge "Check kernel version before running qtaguid test" am: 3b38b58b1f am: 6563bb9f75
am: 9e998c4312

Change-Id: I448478ec089c6fd9676ca3b034d8bc8c5ddad23b
2018-01-11 21:43:27 +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
Sudheer Shanka
f54b3dd76a Update PROCESS_STATE_FOREGROUND_SERVICE constant value.
Bug: 71758358
Test: cts-tradefed run singleCommand cts-dev -m CtsHostsideNetworkTests -t \
      com.android.cts.net.HostsideRestrictBackgroundNetworkTests

Change-Id: Ia4509e94e33db5b61bf1aea704d25a199d381494
2018-01-11 12:44:58 -08: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
e41dcace07 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
am: c9b54a0300

Change-Id: I52c7244fa7c413a89fba46c01be8d5cc788abe62
2018-01-10 22:40:25 +00:00
Adam Vartanian
9647f7cae4 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
am: ed0e832254  -s ours

Change-Id: I6e4725937148f2ee1191f28b2b2a6f83756af65c
2018-01-10 22:37:14 +00:00
Android Merger
b365914591 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
am: 4fa874ccc5

Change-Id: Ifab5905d31850998814e06aafc9318367a47289e
2018-01-10 22:34:49 +00:00
Adam Vartanian
0278688a6f 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
am: ef98ca7cab  -s ours

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

Change-Id: I5af81034b6508371ecb41fe7227acfe3da5afcaf
2018-01-10 22:29:52 +00:00
Adam Vartanian
b3f118414c 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
am: ee5d92a11d

Change-Id: I59b85b44e61ee965f0eb20964dcd3c17310d66d9
2018-01-10 22:23:46 +00:00
Adam Vartanian
739edbcc15 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
am: 6ea80d5148  -s ours

Change-Id: I2255f60cae7b968eeeff26bdb5dc24e6087e6636
2018-01-10 22:20:34 +00:00
Android Build Merger (Role)
06a1877c60 Merge changes from topic "am-ab809732e70048beb4646f9609db691c" into oc-mr1-dev-plus-aosp
am: 513080c4d3

Change-Id: I7298ae6d7fa2847a125137c16e611f74064aa6bd
2018-01-10 22:18:35 +00:00
Adam Vartanian
88ed833296 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
am: 12b98db4c3  -s ours

Change-Id: If5415f8f98cd19099b734dc4f4604add1a253ab3
2018-01-10 22:07:03 +00: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
Android Merger
68b63488f5 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
am: b74553ee64

Change-Id: I93f8a7d1a027236a7286cbb7d969731f536e30a9
2018-01-10 21:56:18 +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
64cc460be3 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
am: abf05416b9  -s ours

Change-Id: I278d057888e942fb626abfae7c6564a2bad19e1d
2018-01-10 21:52:20 +00:00
Android Build Merger (Role)
cc1115e12a Merge changes from topic "am-78d56b92e8374ea69d3020f927cd3a08" into oc-mr1-dev-plus-aosp
am: 11c9381256

Change-Id: I615649a3088b7ee39a722d2e801ddfb583b739fb
2018-01-10 21:49:15 +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
Adam Vartanian
3172d2da40 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
am: e1e9960037  -s ours

Change-Id: If0830639c913a960178d5357ec1b3dd1e118b674
2018-01-10 21:37:48 +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
Android Build Merger (Role)
ae11fd1d17 Merge changes from topic "am-177bacee3d764303895ed5e1e72bf859" into oc-dev am: 2f8017a25a am: 5af7a7290f am: 09f933b601
am: 0fe0808a01

Change-Id: I551f40409aed0a18e82500af15e912d0250b0545
2018-01-10 21:27:00 +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 Merger
6fd6f29cc9 Merge changes from topic "am-a8c42e83471740dd9885d0dcccdf8907" into oreo-cts-dev am: afff62b0b9 am: f2b8d031ab am: 0be73f463a am: 91e08510b1
am: 9426ada6fd

Change-Id: Idb5feb4cbbbc03ed65d3a9ff5106d187ca31270d
2018-01-10 21:21:52 +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