Commit Graph

882 Commits

Author SHA1 Message Date
Ray Essick
2af33bcc3e [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454
am: b32ca8fa74  -s ours

Change-Id: I8e032bcbf55d459d9d28bb762203012ace5b1e6a
2018-04-09 15:42:03 -07:00
Adam Vartanian
1c7d94f2f7 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:45:37 -07: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 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 Build Merger (Role)
b9a731a6c9 [automerger] DO NOT MERGE: Fix issue of also adding "<packge>2" am: 9abf6a313b am: 83c8faf6d9 am: ffed9269ba skipped: 8a8bebe6a1
Change-Id: I5d3d4f63359eec49e4d57613ff6c7c77d7377d6e
2018-01-16 21:43:15 +00:00
Android Merger
f582e9dede Merge changes from topic "am-fc4976ef3f1a43da90fcb5b64fad74c0" into nougat-cts-dev
* changes:
  Merge changes from topic "am-df77b614140440a9aca0e4b8a4a83d73" into marshmallow-cts-dev am: 27e23e96ca
  DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f  -s ours am: 181a10e364  -s ours
2018-01-16 21:28:42 +00:00
Android Merger
2d8bad1b3b Merge changes from topic "am-df77b614140440a9aca0e4b8a4a83d73" into marshmallow-cts-dev
am: 27e23e96ca

Change-Id: Ic1e94cf87bd0cf722ba1212ae0251d3c06f93f73
2018-01-16 21:28:30 +00:00
Adam Vartanian
84a9da7ac9 DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f -s ours
am: 181a10e364  -s ours

Change-Id: Iea8aaec612ff4837000fece3813764b424f9227b
2018-01-16 21:27:42 +00:00
Android Merger
edf8250d28 Merge changes from topic "am-df77b614140440a9aca0e4b8a4a83d73" into marshmallow-cts-dev am: 27e23e96ca am: 326fcb43e5
am: e98d4f9f59

Change-Id: I8c851ce455f33edf9b949769c409f9484d905500
2018-01-12 00:17:09 +00:00
Adam Vartanian
eb712f2808 DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f -s ours am: 181a10e364 -s ours am: 18e3114317
am: b7a93eb721

Change-Id: I758fa1d489e64c82465443cc6f91a23673060d7d
2018-01-12 00:16:34 +00:00
Android Merger
326fcb43e5 Merge changes from topic "am-df77b614140440a9aca0e4b8a4a83d73" into marshmallow-cts-dev
am: 27e23e96ca

Change-Id: I6426e42847ee1f039deeea78380525fb2ef4344a
2018-01-12 00:08:17 +00:00
Adam Vartanian
18e3114317 DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f -s ours
am: 181a10e364  -s ours

Change-Id: I02d9a3e66d85372055c4f29a54fad3679cece053
2018-01-12 00:07:35 +00:00
Android Merger
27e23e96ca Merge changes from topic "am-df77b614140440a9aca0e4b8a4a83d73" into marshmallow-cts-dev
* changes:
  Merge changes from topic "l1" into lollipop-mr1-cts-dev am: ba3927948d
  DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f  -s ours
2018-01-11 23:56:54 +00:00
Adam Vartanian
b0ba87dd9b Merge changes from topic "l1" into lollipop-mr1-cts-dev
am: ba3927948d

Change-Id: I71f9c4d293a0913b3274b070a6ed50c4731ab1b1
2018-01-11 23:56:45 +00:00
Adam Vartanian
181a10e364 DO NOT MERGE Add CTS test for URI fix.
am: 36c5e0d87f  -s ours

Change-Id: I3f40aa91536bde04f153c3f0d6c218b556d40238
2018-01-11 23:56:40 +00:00
Treehugger Robot
ba3927948d Merge changes from topic "l1" into lollipop-mr1-cts-dev
* changes:
  DO NOT MERGE Add CTS test for URI fix.
  DO NOT MERGE Add EffectBundleTest
  DO NOT MERGE Add CTS test for cve_2017_0852_b_62815506
2018-01-11 23:52:44 +00:00
Adam Vartanian
36c5e0d87f 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-11 15:18:47 -08:00
Adam Vartanian
a7461df68d Merge changes from topic "mm" into marshmallow-cts-dev am: 2996702607 am: 3f2c592c8d am: b7279d7562 am: 017cac1442
am: 782f3283ab

Change-Id: I697056d07928751b8a9fd28b1e7d62dfd11cb2ca
2018-01-10 19:50:58 +00:00
Adam Vartanian
abd196715f DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db -s ours am: 8db54315a0 am: c0411106a9 am: 6f4857d900
am: b1969e0aa9  -s ours

Change-Id: I74ea94e5691e20770173a16a4236d894ed016a39
2018-01-10 19:50:09 +00:00
Adam Vartanian
017cac1442 Merge changes from topic "mm" into marshmallow-cts-dev am: 2996702607 am: 3f2c592c8d
am: b7279d7562

Change-Id: I1e4f6c9b0a217422b8f9b8a3d031d6f4c5c25592
2018-01-10 19:29:58 +00:00
Adam Vartanian
6f4857d900 DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db -s ours am: 8db54315a0
am: c0411106a9

Change-Id: I9b4f33e8726faeedc3e00d00a1ff69826e7467f4
2018-01-10 19:29:33 +00:00
Android Merger
bfbc502b70 Merge changes from topic "am-0577043ff24a4117bd4867dedbf2b6df" into nougat-cts-dev
am: bc18e7e105

Change-Id: I1ea99297879174cd2b91f05408d765e705c612d4
2018-01-10 19:25:44 +00:00
Adam Vartanian
8cb75edc3a DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db -s ours
am: dfbb7a24e1  -s ours

Change-Id: Id23f5b58c058be206490b403981c850edff8f338
2018-01-10 19:24:07 +00:00
Adam Vartanian
3f2c592c8d Merge changes from topic "mm" into marshmallow-cts-dev
am: 2996702607

Change-Id: I83fc43766f88ece92ea6eb13ff7bd5054bc76d39
2018-01-10 19:14:55 +00:00
Adam Vartanian
8db54315a0 DO NOT MERGE Add CTS test for URI fix.
am: 1efb5151db  -s ours

Change-Id: I8385254be56e18bcbd2e1d1614b371acbdc2cb00
2018-01-10 19:14:49 +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
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
Adam Vartanian
c6743de860 Merge changes from topic "n" into nougat-cts-dev
am: a220d6d27d

Change-Id: I1228020231b3d1e0d9e26891b813060bcc862c4c
2018-01-10 19:12:04 +00:00
Adam Vartanian
efb0258e08 DO NOT MERGE Add CTS test for URI fix.
am: 53a9c9bc34  -s ours

Change-Id: Idb0448c477445735b31a0dcd9d30df069470ff85
2018-01-10 19:11:55 +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
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
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
Sudheer Shanka
662e13b57a Merge "Increase timeout for ordered broadcast response." into nougat-cts-dev
am: 203361a0c3

Change-Id: I7bd246e79792960c53e12c166a255eabe7f428ed
2017-09-07 18:11:26 +00:00
Sudheer Shanka
07e00f7523 Increase timeout for ordered broadcast response.
Bug: 65269531
Test: cts-tradefed run singleCommand cts-dev -m CtsHostsideNetworkTests -t \
      com.android.cts.net.HostsideRestrictBackgroundNetworkTests
Merged-In: Ibdb84048b04405f234aa5ad9124eb70e9e592498
Merged-In: I99668396abcf7421cd7ffb9118e309aaecb80f07

Change-Id: I6f1de7ccc8d4164dc6f770b54863c04bb7d9e62e
2017-09-05 14:56:04 -07:00
Chenbo Feng
3d166665b1 Resolve merge conflicts of 2ce31b513f to nyc-dev
Merged-In: Ie9ed8aa604be7c6ae364baa69922b89c006dea72

Test: I solemnly swear I tested this conflict resolution.

Bug: 62489688
2017-07-17 22:34:13 +00:00
Chenbo Feng
280d269f01 Merge "Resolve merge conflicts of 8482d8c85c to nougat-cts-dev" into nougat-cts-dev
am: e37efbd57e

Change-Id: I40463d0c63199f3e93288a95c5ca6cc5eb52f500
2017-07-17 21:09:29 +00:00
Chenbo Feng
997814263d Resolve merge conflicts of 8482d8c85c to nougat-cts-dev
Test: I solemnly swear I tested this conflict resolution.
      in cts-tf: run cts --module CtsNativeNetTestCases

Change-Id: I15253841993a79320dafa8669f0289c28f4ff4ea
2017-07-17 20:44:39 +00:00
Tina Zhou
576bfa9242 Merge "Add test to check sock addr in qtaguid ctrl file" into marshmallow-cts-dev am: 8482d8c85c am: 766fa6a623
am: 14a394402f

Change-Id: I5586b1f18e12f0022040de044ad1291b642dbf9e
2017-07-13 21:17:09 +00:00
Tina Zhou
766fa6a623 Merge "Add test to check sock addr in qtaguid ctrl file" into marshmallow-cts-dev
am: 8482d8c85c

Change-Id: I2fefc3090844c2ed9be8434ad0d0bcd11af13d08
2017-07-13 21:02:32 +00:00