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

968 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephen Li
e29c8b85d4 Revert "Manually merge commit '9be9d5865ba2584a251642359710c074061dee5e' into nyc-dev" am: 07f9388e4f am: 0d9ef269a9 -s ours 
am: 467949ba73

Change-Id: Iaf34e45c20e8d88927741cc29406859f4755f334
 2016-09-14 23:49:25 +00:00
Daniel Xie
9ab72dd975 Manually merge commit '9be9d5865ba2584a251642359710c074061dee5e' into nyc-dev am: 253fdc667a -s ours am: 3cccbf13bc am: cae16d2533 am: d9f19088b1 -s ours 
am: 49725c1b28

Change-Id: Ia05adab2bd4beab929fd5a085e03d3600db2926c
 2016-09-14 23:49:23 +00:00
Stephen Li
467949ba73 Revert "Manually merge commit '9be9d5865ba2584a251642359710c074061dee5e' into nyc-dev" am: 07f9388e4f 
am: 0d9ef269a9  -s ours

Change-Id: I8fdaad43af02f55d47c70d1b8b5526bd6dcfb835
 2016-09-14 23:08:43 +00:00
Daniel Xie
49725c1b28 Manually merge commit '9be9d5865ba2584a251642359710c074061dee5e' into nyc-dev am: 253fdc667a -s ours am: 3cccbf13bc am: cae16d2533 
am: d9f19088b1  -s ours

Change-Id: I91b8ac41ff36861ab92ba03b61281a080748e5de
 2016-09-14 23:07:54 +00:00
Daniel Xie
d9f19088b1 Manually merge commit '9be9d5865ba2584a251642359710c074061dee5e' into nyc-dev am: 253fdc667a -s ours am: 3cccbf13bc 
am: cae16d2533

Change-Id: I4e9609af7a72ab8333a77c24c399316314b52f15
 2016-09-14 22:44:19 +00:00
Stephen Li
0d9ef269a9 Revert "Manually merge commit '9be9d5865ba2584a251642359710c074061dee5e' into nyc-dev" 
am: 07f9388e4f

Change-Id: I33126a859f4cf14227f743b74fd965b3a0737e9b
 2016-09-14 22:36:57 +00:00
Daniel Xie
cae16d2533 Manually merge commit '9be9d5865ba2584a251642359710c074061dee5e' into nyc-dev am: 253fdc667a -s ours 
am: 3cccbf13bc

Change-Id: I2581fa08b2b9d9875ede207c1fef0dd510e9711f
 2016-09-14 22:35:42 +00:00
Daniel Xie
3cccbf13bc Manually merge commit '9be9d5865ba2584a251642359710c074061dee5e' into nyc-dev 
am: 253fdc667a  -s ours

Change-Id: I209c9227b5b9147e4d042c2db915ba0cb6935175
 2016-09-14 22:27:07 +00:00
Stephen Li
07f9388e4f Revert "Manually merge commit '9be9d5865ba2584a251642359710c074061dee5e' into nyc-dev" 
This reverts commit 253fdc667a.

Change-Id: If8862e289eb6693650713ff819c8b05f65cdeda5
 2016-09-14 22:25:06 +00:00
Daniel Xie
745d334454 Manually merge commit '9be9d5865ba2584a251642359710c074061dee5e' into nyc-dev am: 253fdc667a am: aa76e8b6fc 
am: 53ecd9a0f6

Change-Id: I34f2763b9f94386a4ece698cb76d57fa912caf02
 2016-09-14 22:24:21 +00:00
Daniel Xie
53ecd9a0f6 Manually merge commit '9be9d5865ba2584a251642359710c074061dee5e' into nyc-dev am: 253fdc667a 
am: aa76e8b6fc

Change-Id: I206df391014496de222bc7c94f0c00455529412f
 2016-09-14 21:56:51 +00:00
Daniel Xie
aa76e8b6fc Manually merge commit '9be9d5865ba2584a251642359710c074061dee5e' into nyc-dev 
am: 253fdc667a

Change-Id: Ifc92b1d6c47920c61788d96e36fcf8e81e3dc903
 2016-09-14 21:53:52 +00:00
The Android Automerger
253fdc667a Manually merge commit '9be9d5865ba2584a251642359710c074061dee5e' into nyc-dev 
* commit '9be9d5865ba2584a251642359710c074061dee5e': (75 commits)
  CameraITS scene5 should be skipped if read_3a is not supported
  Added Bluetooth LE tests
  Add CTS tests for LocalSocket read/write timeouts
  Replace libziparchive-host with libziparchive
  Fix clang-tidy warnings in libjnitest.
  Fix clang-tidy warnings in librscpptest.
  Fix clang-tidy warnings in openglperf2.
  Fix clang-tidy warnings in audio_quality.
  Replaces pcre with pcre2
  Add Mockito to deps for Conscrypt tests and remove core-tests
  simpleperf_cts_test: link libevent.
  Add the new android kernel path to includes.
  FileSystemPermisionTest: Drop unused method
  Use mockito-target-minus-junit4.
  android.core.tests.libcore.package.tests: add mockito to the dependencies
  Fix misc-macro-parentheses warnings in cts.
  [RenderScript] Fix refocus test to accommodate different rounding behavior for half_sqrt().
  Remove data race from refocus test
  Remove one test from MediaCodecTest#testCreateInputSurfaceErrors.
  Return all errors, not only the first one.
  ...
 2016-09-14 21:21:50 +00:00
Bill Yi
aa3db10293 Merge commit \'4158fbc54acdcb2c7cc52704a45e0e9f3e93ffe1\' into HEAD am: 02fa7b88cc am: ba68fcfa5a am: bf2d4c864a am: 849aac5aab am: 158bfbece5 am: ca4419f433 
am: c4d9bed560

Change-Id: Ib698d8ecbf9e035c395ac4c170907c40f47561e2
 2016-09-14 03:38:39 +00:00
Bill Yi
3ec7f89e90 Merge commit \'4158fbc54acdcb2c7cc52704a45e0e9f3e93ffe1\' into HEAD am: 02fa7b88cc am: ba68fcfa5a am: bf2d4c864a am: 0324f0f402 
am: 4648ade426

Change-Id: I1a58ad16db77f53e17e14bd32d6fb1f5fe9c1665
 2016-09-14 03:13:24 +00:00
Bill Yi
c4d9bed560 Merge commit \'4158fbc54acdcb2c7cc52704a45e0e9f3e93ffe1\' into HEAD am: 02fa7b88cc am: ba68fcfa5a am: bf2d4c864a am: 849aac5aab am: 158bfbece5 
am: ca4419f433

Change-Id: If705375fdad8ab5ff69d985c9681c355e2d0430e
 2016-09-14 02:17:33 +00:00
Bill Yi
ca4419f433 Merge commit \'4158fbc54acdcb2c7cc52704a45e0e9f3e93ffe1\' into HEAD am: 02fa7b88cc am: ba68fcfa5a am: bf2d4c864a am: 849aac5aab 
am: 158bfbece5

Change-Id: If860b51ef3332b2c7b3a513093261a29d8b4be23
 2016-09-14 02:02:26 +00:00
Bill Yi
4648ade426 Merge commit \'4158fbc54acdcb2c7cc52704a45e0e9f3e93ffe1\' into HEAD am: 02fa7b88cc am: ba68fcfa5a am: bf2d4c864a 
am: 0324f0f402

Change-Id: I5e1158284c0e8daba3c57f8022c89d2239366f16
 2016-09-14 01:51:31 +00:00
Bill Yi
158bfbece5 Merge commit \'4158fbc54acdcb2c7cc52704a45e0e9f3e93ffe1\' into HEAD am: 02fa7b88cc am: ba68fcfa5a am: bf2d4c864a 
am: 849aac5aab

Change-Id: Icf4e3f43f0ec8be45522ede339ef3688703532d6
 2016-09-14 01:48:26 +00:00
Bill Yi
0324f0f402 Merge commit \'4158fbc54acdcb2c7cc52704a45e0e9f3e93ffe1\' into HEAD am: 02fa7b88cc am: ba68fcfa5a 
am: bf2d4c864a

Change-Id: Ia8288753847ee764f197d3a145afb8f5f70fb5ed
 2016-09-14 01:33:55 +00:00
Bill Yi
849aac5aab Merge commit \'4158fbc54acdcb2c7cc52704a45e0e9f3e93ffe1\' into HEAD am: 02fa7b88cc am: ba68fcfa5a 
am: bf2d4c864a

Change-Id: Ie6f0aafa6a3a9bbbcdafb547a17c38c1e5d5672b
 2016-09-14 01:33:25 +00:00
Bill Yi
bf2d4c864a Merge commit \'4158fbc54acdcb2c7cc52704a45e0e9f3e93ffe1\' into HEAD am: 02fa7b88cc 
am: ba68fcfa5a

Change-Id: Ib31a984e09d82c65f217a4e92fe80176b1fb80a5
 2016-09-14 01:22:14 +00:00
Daniel Xie
9be9d5865b Merge "CameraITS scene5 should be skipped if read_3a is not supported" into nougat-cts-dev 2016-09-09 03:33:03 +00:00
TreeHugger Robot
5e7a4643ae Merge "Restore right number of expected intents." 2016-09-08 19:50:16 +00:00
Felipe Leme
0e42d0c0ad Restore right number of expected intents. 
They were changed during a refactoring, which is now finished.

Test: cts-tradefed run commandAndExit cts -m CtsHostsideNetworkTests -t com.android.cts.net.HostsideRestrictBackgroundNetworkTests#testDataSaverMode_enabled

Fixes: 28791717
Change-Id: Ia5e99c0c3d421b7d3b58e11ddde4da222d5f8c15
 2016-09-08 11:02:35 -07:00
Paul Duffin
5405d48988 Merge changes I150aefde,Ic6fc1807,Id82a83fd am: 474407820b am: b9de8e7df1 am: 157de1218f 
am: f2e2158377

Change-Id: I0ec5a8796eeaa8f335d84ff2a1146ad31f611c90
 2016-09-08 12:08:28 +00:00
Ian Rogers
02a4503a15 Fix to CtsHostsideNetworkTestsAidl Java library kind. am: 03ee9869ac am: 2984490109 am: 71ae4905ac 
am: 774ce009c2

Change-Id: I92129ac2ab0a7a0beb9c73a8f1788706aa600cad
 2016-09-08 12:07:28 +00:00
Paul Duffin
f2e2158377 Merge changes I150aefde,Ic6fc1807,Id82a83fd am: 474407820b am: b9de8e7df1 
am: 157de1218f

Change-Id: I9f86ccb16f3d3e143170bfe0b1e2892c9afa6d97
 2016-09-08 12:03:43 +00:00
Ian Rogers
774ce009c2 Fix to CtsHostsideNetworkTestsAidl Java library kind. am: 03ee9869ac am: 2984490109 
am: 71ae4905ac

Change-Id: I9c7829dbf1798003294da17dfd8e11ca128bd2f2
 2016-09-08 12:03:23 +00:00
Paul Duffin
157de1218f Merge changes I150aefde,Ic6fc1807,Id82a83fd am: 474407820b 
am: b9de8e7df1

Change-Id: I54ea4153d1e128bf9eec0609f65a89df7f350ba2
 2016-09-08 11:17:17 +00:00
Ian Rogers
71ae4905ac Fix to CtsHostsideNetworkTestsAidl Java library kind. am: 03ee9869ac 
am: 2984490109

Change-Id: I2892485750d0fb055b20af40a54ea601e9ff5a0e
 2016-09-08 11:17:05 +00:00
Paul Duffin
474407820b Merge changes I150aefde,Ic6fc1807,Id82a83fd 
* changes:
  Fix to CtsHostsideNetworkTestsAidl Java library kind.
  Add missing CTS keystore build dependency.
  Fix Java library dependencies
 2016-09-08 11:03:34 +00:00
Ian Rogers
03ee9869ac Fix to CtsHostsideNetworkTestsAidl Java library kind. 
Fixes Error Prone build.
Bug: 27723540

(cherry picked from commit ad015ac64d0e510cc040a83b1d545e3a1405b1f7)

Change-Id: I150aefde61615023e86e19645a46e432a0183705
 2016-09-08 10:51:30 +01:00
sj.cha
3f230f34b8 Merge "Add some failure comments in VpnTest" am: cf8d6e3253 am: 060aa462cb am: ee2b139f7a 
am: 560981b972

Change-Id: I778fe7e00000ad936855b76feacf69a030c92a60
 2016-09-08 09:42:08 +00:00
sj.cha
560981b972 Merge "Add some failure comments in VpnTest" am: cf8d6e3253 am: 060aa462cb 
am: ee2b139f7a

Change-Id: I225d762890934b8f2355d4a2783cc6d2227a90f3
 2016-09-08 09:37:10 +00:00
sj.cha
ee2b139f7a Merge "Add some failure comments in VpnTest" am: cf8d6e3253 
am: 060aa462cb

Change-Id: Ifb3c10aa186d99add321102d503007b857eba78e
 2016-09-08 09:34:36 +00:00
Treehugger Robot
cf8d6e3253 Merge "Add some failure comments in VpnTest" 2016-09-08 09:24:11 +00:00
Roshan Pius
52e10c01af Merge "CtsNetTests: Fix WifiInfoTest" am: 133d0c3dad am: b75c380c17 am: e1794e1518 
am: bb422cf538

Change-Id: I5421bfe72fc174c60d59ebf61995f04caec2f66a
 2016-09-07 18:03:57 +00:00
Roshan Pius
bb422cf538 Merge "CtsNetTests: Fix WifiInfoTest" am: 133d0c3dad am: b75c380c17 
am: e1794e1518

Change-Id: I55a18563f1ee80cda8064c12cf90092e7945697b
 2016-09-07 17:57:57 +00:00
Roshan Pius
e1794e1518 Merge "CtsNetTests: Fix WifiInfoTest" am: 133d0c3dad 
am: b75c380c17

Change-Id: I62e56e6c6862eb15e2e86c88b1c3ba6f804291b6
 2016-09-07 17:52:09 +00:00
Roshan Pius
f1bb48635d CtsNetTests: Fix WifiInfoTest 
According to the public documentation of WifiInfo.getSSID(), the
returned value can be one of the following:
1. Hex digits if the SSID cannot be decoded as UTF-8.
2. String surrounded by double quotes if the SSID can be decoded as
UTF-8.
3. <unknown ssid>, if not connected.

Fix the test to check for all these 3 string values.

BUG: 31272462
TEST: The failing CTS test passes now.
Change-Id: I26e12d28994e3cdb4cd1bd9e999633b327ad5830
 2016-09-07 08:56:45 -07:00
Neil Fuller
1286bdd2d9 Merge "Add CTS tests for LocalSocket read/write timeouts" into nyc-mr1-dev am: cd198fbef3 am: 5cc207a964 
am: b5265d650d

Change-Id: I615fece84b16e8d53aa94637e191411a6a45c191
 2016-09-06 22:08:03 +00:00
Neil Fuller
b5265d650d Merge "Add CTS tests for LocalSocket read/write timeouts" into nyc-mr1-dev am: cd198fbef3 
am: 5cc207a964

Change-Id: I314add4903640cd2700e40d01bcc6081e14cc168
 2016-09-06 21:58:53 +00:00
Neil Fuller
233e0a4a16 Add CTS tests for LocalSocket read/write timeouts am: a8574413ed am: 25ee9e4f16 
am: 7fda661ac6

Change-Id: I0a9b033f1dea242c79990c9f16b559cd9922973e
 2016-09-06 21:56:17 +00:00
Neil Fuller
5cc207a964 Merge "Add CTS tests for LocalSocket read/write timeouts" into nyc-mr1-dev 
am: cd198fbef3

Change-Id: I9faf26f0cde2e5c41e770aca5c2e768bbc41d26f
 2016-09-06 21:44:10 +00:00
Neil Fuller
7fda661ac6 Add CTS tests for LocalSocket read/write timeouts am: a8574413ed 
am: 25ee9e4f16

Change-Id: I65c20492d4d4fc0ccc2b65e977fdeedb878be131
 2016-09-06 21:44:06 +00:00
Neil Fuller
25ee9e4f16 Add CTS tests for LocalSocket read/write timeouts 
am: a8574413ed

Change-Id: Idaa5bbb41434e34e52020320329d18c0c08920d1
 2016-09-06 21:32:40 +00:00
TreeHugger Robot
cd198fbef3 Merge "Add CTS tests for LocalSocket read/write timeouts" into nyc-mr1-dev 2016-09-06 21:20:20 +00:00
TreeHugger Robot
31e0b838b7 Merge "Fixed number wrong number of expected intents." 2016-09-03 05:47:46 +00:00
Neil Fuller
df56c2eaf8 Merge "Add CTS tests for LocalSocket read/write timeouts" am: 83bddfd9ec am: 50ac25a1a7 am: 40a4a76824 
am: ac8e98758f

Change-Id: Id32c8da8eb9df3790c37360e9b321ae745e1d89d
 2016-09-01 01:17:12 +00:00