Commit Graph

50577 Commits

Author SHA1 Message Date
Suren Baghdasaryan fd341b54bd resolve merge conflicts of 9b77c0ba32 to qt-dev-plus-aosp
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I41222988279c73a22f015f26c4d6e88fbfbb009f
2019-05-21 14:22:20 -07:00
Suren Baghdasaryan 9b77c0ba32 Merge "libprocessgroup: add flags to indicate when a controller failed to mount" into qt-dev 2019-05-21 16:53:52 +00:00
Florian Mayer 701659ee26 Merge "Include string.h for strcmp." am: 7dc7c3a9c6
am: 756c3f105a

Change-Id: Ie6d3138f985dc213dc168202a968e9ebafead1a4
2019-05-21 05:17:39 -07:00
Florian Mayer 756c3f105a Merge "Include string.h for strcmp."
am: 7dc7c3a9c6

Change-Id: Ide8cc6afd7f8bae9509d067106e3b614df1b834c
2019-05-21 05:11:28 -07:00
Florian Mayer 7dc7c3a9c6 Merge "Include string.h for strcmp." 2019-05-21 11:53:46 +00:00
dimitry d2231d0e2d Merge changes I8186718c,I8d6f33e9,I56fe5e11,Ie4004c98,I531d3d60, ... am: b26696e2dd
am: f7e9467a31

Change-Id: Iaf243bead1df42205b8c7b35f6336e5b664c45aa
2019-05-21 02:24:56 -07:00
dimitry f7e9467a31 Merge changes I8186718c,I8d6f33e9,I56fe5e11,Ie4004c98,I531d3d60, ...
am: b26696e2dd

Change-Id: I0831809e6b0ece5d3e20c660f3331e6dc5466f79
2019-05-21 02:18:12 -07:00
Treehugger Robot b26696e2dd Merge changes I8186718c,I8d6f33e9,I56fe5e11,Ie4004c98,I531d3d60, ...
* changes:
  Enable native_bridge_support for libvndksupport
  Enable native_bridge_support for libprocessgroup
  Enable native_bridge_support for libcutils
  Enable native_bridge_support for libsystem_headers
  Enable native_bridge_support for libbacktrace_headers
  Enable native_bridge_support for libutils
2019-05-21 09:01:00 +00:00
Hridya Valsaraju f5d37bd0d8 [automerger skipped] Merge "Get max-download-size from device during fastbootd for flashall/update" into qt-dev
am: 2a19765eb5 -s ours
am skip reason: change_id Ife7c1ec0583d80d4a31ecf01f1fc14a8365afe0d with SHA1 83d856e4c5 is in history

Change-Id: I4bea67222d2e6a4091c4e40af1fd3ff4b1aadecf
2019-05-20 22:39:53 -07:00
TreeHugger Robot 2a19765eb5 Merge "Get max-download-size from device during fastbootd for flashall/update" into qt-dev 2019-05-21 04:54:08 +00:00
Peter Collingbourne b9b9d3754c Merge "Link the "runtime" namespace to more namespaces." am: 3e48b66578
am: 1b9a1c20db

Change-Id: Ic33fc84d752fa3fd487401f348be38c7531bfdea
2019-05-20 21:51:24 -07:00
Peter Collingbourne 1b9a1c20db Merge "Link the "runtime" namespace to more namespaces."
am: 3e48b66578

Change-Id: I0b0a52224419e6fe01b2212a407919c6c4367cc2
2019-05-20 21:10:55 -07:00
Peter Collingbourne 3e48b66578 Merge "Link the "runtime" namespace to more namespaces." 2019-05-21 02:29:46 +00:00
Josh Gao 41d1375ec5 Merge "adbd: reduce queue depths." into qt-dev
am: 7eeed22871

Change-Id: Ieaa1a5045fab99b84a03cc29b89b816fe0a04749
2019-05-20 19:22:04 -07:00
Hridya Valsaraju cdb75a8f1d Merge "Get max-download-size from device during fastbootd for flashall/update" am: b545055f6d
am: 322daf4ac3

Change-Id: I9f57a2a9bec10c9711c6c016d2da54eebff13a66
2019-05-20 18:40:58 -07:00
Josh Gao 22edd6735c Merge "adbd: avoid starting multiple worker threads." into qt-dev
am: 5b882637e1

Change-Id: I06da5cc0e0ccbe182a6424cff670f7bddda0d1db
2019-05-20 18:28:55 -07:00
Josh Gao 26a6faf0ae Merge "adbd: read, print, and ignore USB control transfers." into qt-dev
am: 6031286936

Change-Id: I3e1a2052406b3399f7e11176ac2aca1adcb20f52
2019-05-20 17:17:31 -07:00
Hridya Valsaraju 322daf4ac3 Merge "Get max-download-size from device during fastbootd for flashall/update"
am: b545055f6d

Change-Id: I0353565ff251952d6d0ca9f0ee1fcfeae775effe
2019-05-20 17:11:31 -07:00
TreeHugger Robot 7eeed22871 Merge "adbd: reduce queue depths." into qt-dev 2019-05-21 00:05:34 +00:00
TreeHugger Robot 5b882637e1 Merge "adbd: avoid starting multiple worker threads." into qt-dev 2019-05-21 00:04:15 +00:00
Hridya Valsaraju f929aaa7c0 Get max-download-size from device during fastbootd for flashall/update
Currently, during a 'fastboot flashall/fastboot update', the 'getvar
max-download-size' command is issued once to the device when it is in
bootloader mode and the same value is used even after the device boots
into fastbootd. If the max-download-size returned by bootloader is
greater than the max-download-size in fastbootd, this could break flash
as large images are broken down into chunks before downloading by using
the max-download-size variable. This will cause fastbootd to return
an error since it checks whether the buffer being downloaded has a size
greater than the max-download-size limit.

Test: fastboot flashall
Bug: 132917902

Change-Id: Ife7c1ec0583d80d4a31ecf01f1fc14a8365afe0d
Merged-In: Ife7c1ec0583d80d4a31ecf01f1fc14a8365afe0d
(cherry picked from commit 83d856e4c5)
2019-05-20 23:58:45 +00:00
Treehugger Robot b545055f6d Merge "Get max-download-size from device during fastbootd for flashall/update" 2019-05-20 22:50:10 +00:00
TreeHugger Robot 6031286936 Merge "adbd: read, print, and ignore USB control transfers." into qt-dev 2019-05-20 21:37:24 +00:00
Hridya Valsaraju 37124c2e95 Merge "Check DTB image size for boot image header version 2 and above" am: cd9b18f215
am: a19c7f1d3a

Change-Id: I1ac4fc529b9c57c8712c2ed32325a20f6f0dbb1d
2019-05-20 13:47:05 -07:00
Hridya Valsaraju a19c7f1d3a Merge "Check DTB image size for boot image header version 2 and above"
am: cd9b18f215

Change-Id: Ic6069e05af1aac0c307905bc0ee48cb04d957759
2019-05-20 12:49:31 -07:00
Treehugger Robot cd9b18f215 Merge "Check DTB image size for boot image header version 2 and above" 2019-05-20 17:40:44 +00:00
Hridya Valsaraju 83d856e4c5 Get max-download-size from device during fastbootd for flashall/update
Currently, during a 'fastboot flashall/fastboot update', the 'getvar
max-download-size' command is issued once to the device when it is in
bootloader mode and the same value is used even after the device boots
into fastbootd. If the max-download-size returned by bootloader is
greater than the max-download-size in fastbootd, this could break flash
as large images are broken down into chunks before downloading by using
the max-download-size variable. This will cause fastbootd to return
an error since it checks whether the buffer being downloaded has a size
greater than the max-download-size limit.

Test: fastboot flashall
Bug: 536870912

Change-Id: Ife7c1ec0583d80d4a31ecf01f1fc14a8365afe0d
2019-05-20 09:37:22 -07:00
vichang 17db1bef04 Merge "Allow linking to libicuuc.so and libicui18n.so from executable in /data" am: de725e6e75
am: 5c75fb81e8

Change-Id: I7bc0ba6a06d7b32c6de61d14658c4c3e9f43d417
2019-05-20 03:08:58 -07:00
vichang 5c75fb81e8 Merge "Allow linking to libicuuc.so and libicui18n.so from executable in /data"
am: de725e6e75

Change-Id: Iff94f22ed4dc64e446e746982561f4750ea32347
2019-05-20 03:03:36 -07:00
vichang de725e6e75 Merge "Allow linking to libicuuc.so and libicui18n.so from executable in /data" 2019-05-20 09:49:21 +00:00
Jiyong Park aea98f16bb Merge "Fix nullpointer dereference in libnativeloader" am: 724cbb080d
am: 77a2e830e7

Change-Id: I699e314a7a0c68dad3bd9a977862ce31a17af555
2019-05-17 20:54:15 -07:00
Jiyong Park 77a2e830e7 Merge "Fix nullpointer dereference in libnativeloader"
am: 724cbb080d

Change-Id: Iba547fc4ca6539cae2e028b1d58ecec657c9886f
2019-05-17 20:14:28 -07:00
Jiyong Park 724cbb080d Merge "Fix nullpointer dereference in libnativeloader" 2019-05-18 02:20:57 +00:00
Josh Gao 12807c7012 adbd: read, print, and ignore USB control transfers.
It seems like we're blowing up when receiving a control transfer that's
intended for Android Auto, because we're not expecting to get the data
for the control transfer in a subsequent read.

Bug: http://b/131867920
Test: none
Change-Id: Icfd642e6dfc02d2ccbdd60c39f89e534298c944d
2019-05-17 18:34:23 -07:00
Hridya Valsaraju 96fd8874ef Check DTB image size for boot image header version 2 and above
DTB in boot image is mandatory for boot image header version 2
and above. mkbootimg.py must check the size of the DTB image passed
to it and throw an error if the image is empty.

Test: build with no DTB files in BOARD_PREBUILT_DTBIMAGE_DIR
Bug: 133006443
Change-Id: I478fcdb8e77957848a93027e695fcb238c544d62
2019-05-17 16:49:56 -07:00
Suren Baghdasaryan fd285d2b70 libprocessgroup: add flags to indicate when a controller failed to mount
Controllers listed in cgroups.json file might fail to mount if kernel is
not configured to support them. We need a way to indicate whether a
controller was successfully mounted and is usable to avoid logging errors
and warnings when a controller that failed to mount is being used. Add
flags bitmask to cgrouprc controller descriptor and use a bit to indicate
that controller is successfully mounted. Modify cpusets_enabled() and
schedboost_enabled() functions to use this bit and report the actual
availability of the controller.

Bug: 124080437
Test: libcutils_test with cpuset and schedtune controllers disabled
Change-Id: I770cc39fe50465146e3205aacf77dc3c56923c5d
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
2019-05-17 16:18:29 -07:00
Florian Mayer 5795d0b1a8 Include string.h for strcmp.
Change-Id: I57a6505446e63567b0be8496cf1f0d9326e930f7
2019-05-17 19:49:26 +01:00
Jiyong Park d970ccb56e Fix nullpointer dereference in libnativeloader
The `char* path` argument of OpenNativeLibrary() can be nullptr. We are
constructing std::string from the path, which is a bug. Fixing it by
using char* without converting it to std::string.

Test: run-gtests.sh
JniCompilerTest.CompileAndRunIntMethodThroughStubNormalCompiler
is successful.

Change-Id: I91249da7c1a72a2dff9bc77e477b465e0c7ee056
2019-05-17 18:51:44 +09:00
Matthew Maurer 24b1e7ffa9 Merge "Trusty Keymaster@4.0" am: 6efb8e7754
am: 7c42bc5f70

Change-Id: Ibc99163fba1389238ec5fa8152f1809572be8f1e
2019-05-17 00:21:39 -07:00
Matthew Maurer 7c42bc5f70 Merge "Trusty Keymaster@4.0"
am: 6efb8e7754

Change-Id: If113ce8c7386ad896a0f8d8ba496b948875a31a1
2019-05-16 21:53:29 -07:00
Treehugger Robot 6efb8e7754 Merge "Trusty Keymaster@4.0" 2019-05-17 01:36:18 +00:00
Evgenii Stepanov b763782076 Merge "Initialize all fields of struct iocb." into qt-dev
am: 982259add1

Change-Id: Iefe7985575059afb94ae9d11a88a09b6ca3262d5
2019-05-16 17:26:45 -07:00
TreeHugger Robot 982259add1 Merge "Initialize all fields of struct iocb." into qt-dev 2019-05-16 23:27:38 +00:00
Matthew Maurer b321b410ff Trusty Keymaster@4.0
Adds support for proxying V4.0 commands to Trusty and makes 4.0 the
default when including trusty-base.mk.

Bug: 128851722
Test: Keymaster VTS 4.0 + Trusty
Change-Id: I2e2220963996fcb88d6953ee1a58af1b947b857d
2019-05-16 14:19:50 -07:00
Evgenii Stepanov 9da358d6d3 Initialize all fields of struct iocb.
Kernel does not accept non-zero value of iocb->aio_reserved2.

Bug: 132803232
Test: initialize malloc() memory to non-zero pattern and see what breaks

Change-Id: I65a7e89e3a2c1ba79df1dc2d011d6c76c41afb81
(cherry picked from commit fe7eca7b8f)
2019-05-16 12:55:41 -07:00
Tom Cherry a4e44ccda9 Merge "init: always initialize device-mapper" am: 8a3630e327
am: 506611ef99

Change-Id: Ic668ffeb8382b16f4ec52dcfa6e59f5e89656055
2019-05-16 08:23:23 -07:00
Martijn Coenen 67398d35d4 [automerger skipped] Merge "class_start_post_data also starts disabled services." am: 68b378f980
am: f4249b0f38 -s ours
am skip reason: change_id I1e81e2c8e0ab2782150073d74e50e4cd734af7b9 with SHA1 ebce675b17 is in history

Change-Id: Iecb9f8d50dba5ea9d13da8d878a2e5547c92f0a2
2019-05-16 08:22:34 -07:00
Tom Cherry 506611ef99 Merge "init: always initialize device-mapper"
am: 8a3630e327

Change-Id: I0d67ff1504b05abcd890977446bd6b58b6334f5f
2019-05-16 08:18:06 -07:00
Martijn Coenen f4249b0f38 Merge "class_start_post_data also starts disabled services."
am: 68b378f980

Change-Id: Ie4700679ebb86a076f0b25b6282092353583aa67
2019-05-16 08:17:26 -07:00
Tom Cherry 8a3630e327 Merge "init: always initialize device-mapper" 2019-05-16 15:09:16 +00:00