LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
968 Commits 2 Branches 0 Tags
2cfab2140fd447cbedb97146d6bec464491f2271
Commit Graph

968 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Android Build Merger (Role)
2cfab2140f Merge changes from topic "am-f19c1bc8474a40c18b6f95c5c34b395d" into nyc-mr1-dev 
* changes:
  Merge changes from topic "am-7882172707e5453d9160ca56a0a63ffc" into nougat-mr1-cts-dev am: 293664a1fb
  DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db  -s ours am: dfbb7a24e1  -s ours am: d9ac06f2c2  -s ours
 2018-01-10 19:39:44 +00:00
Android Merger
df56d8e2d0 Merge changes from topic "am-7882172707e5453d9160ca56a0a63ffc" into nougat-mr1-cts-dev 
am: 293664a1fb

Change-Id: I24b0b2bff4c68f185a0ed0ef62cc00a1cf1ef185
 2018-01-10 19:30:41 +00:00
Adam Vartanian
f456658884 DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db -s ours am: dfbb7a24e1 -s ours 
am: d9ac06f2c2  -s ours

Change-Id: I67feb6491c120e42f274aa78e553a3127cbe475e
 2018-01-10 19:28:21 +00:00
Adam Vartanian
c6545ebce1 Merge changes from topic "n" into nougat-cts-dev am: a220d6d27d am: c6743de860 
am: d58943f9bd

Change-Id: Ie9e2f0cf91733e72e08dff48eb92434a3188f116
 2018-01-10 19:24:46 +00:00
Adam Vartanian
e3542ba9d1 DO NOT MERGE Add CTS test for URI fix. am: 53a9c9bc34 -s ours am: efb0258e08 
am: 2c7b1033b8

Change-Id: Ie987c2d765efa619cbc5d5dfd9e24787f738e766
 2018-01-10 19:23:50 +00:00
Android Merger
a463421450 Merge changes from topic "am-4532af43002d481bba66a249d6a74576" into nougat-mr1-cts-dev 
am: f59fbfb5a4

Change-Id: Ic6b7c2ca51efefa07d07f25aa8636067dfd15069
 2018-01-10 19:20:38 +00:00
Adam Vartanian
d58943f9bd Merge changes from topic "n" into nougat-cts-dev am: a220d6d27d 
am: c6743de860

Change-Id: I4a7465bfae8fec503987e7587d81e74982fd57b8
 2018-01-10 19:18:46 +00:00
Adam Vartanian
bf44542d59 DO NOT MERGE Add CTS test for URI fix. am: 53a9c9bc34 -s ours 
am: 175d980772  -s ours

Change-Id: Ib86bbf945a20b57aef400db20614de5aab0a7d86
 2018-01-10 19:18:36 +00:00
Android Merger
293664a1fb Merge changes from topic "am-7882172707e5453d9160ca56a0a63ffc" into nougat-mr1-cts-dev 
* changes:
  Merge changes from topic "am-0577043ff24a4117bd4867dedbf2b6df" into nougat-cts-dev am: bc18e7e105
  DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db  -s ours am: dfbb7a24e1  -s ours
 2018-01-10 19:18:17 +00:00
Adam Vartanian
2c7b1033b8 DO NOT MERGE Add CTS test for URI fix. am: 53a9c9bc34 -s ours 
am: efb0258e08

Change-Id: Ied68f3ae10135b491ae4583eacd8f8bceaa76c5e
 2018-01-10 19:18:02 +00:00
Android Merger
c0b039c346 Merge changes from topic "am-0577043ff24a4117bd4867dedbf2b6df" into nougat-cts-dev 
am: bc18e7e105

Change-Id: I383d04d335a27c522758b7838f124333822c5e02
 2018-01-10 19:17:53 +00:00
Adam Vartanian
d9ac06f2c2 DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db -s ours 
am: dfbb7a24e1  -s ours

Change-Id: I802ec14db281665d47ae01ab90b0f8797237a2f2
 2018-01-10 19:16:50 +00:00
Adam Vartanian
ce2230abfd Merge changes from topic "n1" into nougat-mr1-cts-dev 
am: 76faaa3996

Change-Id: I74f70be3489966d4ee6b170fa0198f1d221f6044
 2018-01-10 19:15:04 +00:00
Adam Vartanian
78f5d24a4f DO NOT MERGE Add CTS test for URI fix. 
am: 08044f045c  -s ours

Change-Id: Iab63360367bfe64757864efd848bc5b117a71f85
 2018-01-10 19:14:52 +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
Android Merger
f59fbfb5a4 Merge changes from topic "am-4532af43002d481bba66a249d6a74576" into nougat-mr1-cts-dev 
* changes:
  Merge changes from topic "n" into nougat-cts-dev am: a220d6d27d
  DO NOT MERGE Add CTS test for URI fix. am: 53a9c9bc34  -s ours
 2018-01-10 19:08:34 +00:00
Adam Vartanian
0aa1444c8e Merge changes from topic "n" into nougat-cts-dev 
am: a220d6d27d

Change-Id: I406953a4713b768012d123a33db06268e8cf3799
 2018-01-10 19:07:44 +00:00
Adam Vartanian
175d980772 DO NOT MERGE Add CTS test for URI fix. 
am: 53a9c9bc34  -s ours

Change-Id: I1402f70414d6ba6b89224d37af32bbe47157d1b5
 2018-01-10 19:07:26 +00:00
Treehugger Robot
76faaa3996 Merge changes from topic "n1" into nougat-mr1-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:06:35 +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
08044f045c 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 13:31:30 -08: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
fb73667810 Add CTS test for URI fix. am: a01da8536c am: b1b5379591 am: 73105d42aa am: c210cc1a90 am: 5d8ba63f42 am: e88ef1b832 am: 1e1de4f052 
am: 2204809646

Change-Id: Ic96d9b4693178421303c45ac628c456b66cdf655
 2017-11-07 22:35:33 +00:00
Adam Vartanian
2204809646 Add CTS test for URI fix. am: a01da8536c am: b1b5379591 am: 73105d42aa am: c210cc1a90 am: 5d8ba63f42 am: e88ef1b832 
am: 1e1de4f052

Change-Id: I4153cfa021655ba19b4b6dca19b70aaf91b5caa8
 2017-11-07 22:08:32 +00: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
7cbb2f7587 Merge "Increase timeout for ordered broadcast response." into nougat-cts-dev am: 203361a0c3 am: 662e13b57a 
am: 46f8aa6d48

Change-Id: If6fb0012849a0b95344fa4ed5f2e3985340a03a1
 2017-09-07 18:25:15 +00:00
Sudheer Shanka
46f8aa6d48 Merge "Increase timeout for ordered broadcast response." into nougat-cts-dev am: 203361a0c3 
am: 662e13b57a

Change-Id: I0d070bfbe19666f77b9ae21c19893f776389fac0
 2017-09-07 18:20:35 +00:00
Sudheer Shanka
f0bc6efb5e Merge "Merge "Increase timeout for ordered broadcast response." into nougat-cts-dev am: 203361a0c3" into nougat-mr1-cts-dev 
am: b5abc8f89b

Change-Id: Ic3aee8310d6250d15a5414640dbd35cb66a7c18c
 2017-09-07 18:17:21 +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
Android Merger
b5abc8f89b Merge "Merge "Increase timeout for ordered broadcast response." into nougat-cts-dev am: 203361a0c3" into nougat-mr1-cts-dev 2017-09-07 18:08:35 +00:00
Sudheer Shanka
9418ecdc40 Merge "Increase timeout for ordered broadcast response." into nougat-cts-dev 
am: 203361a0c3

Change-Id: Ifbd3594524de6fc45cb199345715794f9869c9d6
 2017-09-07 18:08:27 +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
Lorenzo Colitti
80c62eb79b Merge "Dup fds to stop finalizers from invalidating them." into nougat-mr1-cts-dev 
am: bfabfe75f9

Change-Id: If02ea4f12870acb3e5e1bce9e9ddbc42c0fd05f0
 2017-08-09 16:29:49 +00:00
Treehugger Robot
bfabfe75f9 Merge "Dup fds to stop finalizers from invalidating them." into nougat-mr1-cts-dev 2017-08-09 16:17:22 +00:00
Chenbo Feng
120ebca195 Resolve merge conflicts of 2ce31b513f to nyc-dev am: 3d166665b1 
am: 0545b99cab

Change-Id: Id42297c51419c1c6cfe35222648b66015c3e8887
 2017-07-18 18:25:17 +00:00
Chenbo Feng
0545b99cab Resolve merge conflicts of 2ce31b513f to nyc-dev 
am: 3d166665b1

Change-Id: I218debd55328e87f59aaa387d0ebf4520787bc82
 2017-07-18 18:14:42 +00: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
4b7b9dd4ab Merge "Resolve merge conflicts of 8482d8c85c to nougat-cts-dev" into nougat-cts-dev am: e37efbd57e am: 280d269f01 
am: 05f5afd834

Change-Id: I0c53f19be9898d206c8b5c3ba4784595d509925d
 2017-07-17 21:22:51 +00:00
Chenbo Feng
05f5afd834 Merge "Resolve merge conflicts of 8482d8c85c to nougat-cts-dev" into nougat-cts-dev am: e37efbd57e 
am: 280d269f01

Change-Id: Ic1e80a7b0345cb20180cbe6faed9ca803cabcb60
 2017-07-17 21:16:26 +00:00
Chenbo Feng
e2753dbabb Merge "Merge "Resolve merge conflicts of 8482d8c85c to nougat-cts-dev" into nougat-cts-dev am: e37efbd57e" into nougat-mr1-cts-dev 
am: 26339f2d77

Change-Id: I7ba2bb548300d511ce0b7205e1055554406582f8
 2017-07-17 21:11:59 +00:00