Commit graph

59198 commits

Author SHA1 Message Date
TreeHugger Robot
275ccf192c [automerger skipped] Merge "DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master" into stage-aosp-master am: 6d0b7c5ddd -s ours
am skip reason: subject contains skip directive

Change-Id: Id149cafd50d5d44fb7115da99fc5cae62c3295a7
2020-03-20 18:31:59 +00:00
Ryan Mitchell
d63fd67408 [automerger skipped] Merge "Allow loading zip at an offset in fd" into rvc-dev am: a355d925a5 -s ours
am skip reason: Change-Id I772fc8b462d71de0529717c420ced552103a6e3f with SHA-1 23150e4fe4 is in history

Change-Id: I9a0e5d5bd5c85836dac6cff07ead64a495b78e94
2020-03-20 18:21:08 +00:00
Ryan Mitchell
a355d925a5 Merge "Allow loading zip at an offset in fd" into rvc-dev 2020-03-20 18:16:30 +00:00
TreeHugger Robot
6d0b7c5ddd Merge "DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master" into stage-aosp-master 2020-03-20 18:15:04 +00:00
Josh Gao
6e9bbfcc0e Merge "adbd: add apex_available and visibility for internal libs." am: 448519736b am: b802fd9b1c
Change-Id: I4f3ba750255be96a1f0a0b3a18d16b2266ccf9fa
2020-03-20 10:29:17 +00:00
Josh Gao
b802fd9b1c Merge "adbd: add apex_available and visibility for internal libs." am: 448519736b
Change-Id: I86c2a487a5acf833a763f6a78c0af9d399c310ce
2020-03-20 10:13:16 +00:00
TreeHugger Robot
97046b951c Merge "[adb] Print fewer progress messages for push/pull" into rvc-dev am: 934135d576
Change-Id: I3a05ae90ff85a979a1d4efc661e8c8a2f2aa13e7
2020-03-20 10:13:15 +00:00
TreeHugger Robot
934135d576 Merge "[adb] Print fewer progress messages for push/pull" into rvc-dev 2020-03-20 09:59:55 +00:00
Josh Gao
448519736b Merge "adbd: add apex_available and visibility for internal libs." 2020-03-20 09:58:23 +00:00
TreeHugger Robot
50821ab80b Merge "[adb] Optimize fdevent machinery" into rvc-dev am: fd3b80c99c
Change-Id: I80e4f2baaacb88ec78a6fc0a557fe7d748536e0d
2020-03-20 06:47:42 +00:00
TreeHugger Robot
fd3b80c99c Merge "[adb] Optimize fdevent machinery" into rvc-dev 2020-03-20 06:33:47 +00:00
TreeHugger Robot
057c848b97 [automerger skipped] Merge "fastboot: add support for v3 boot header format" into rvc-dev am: 3b1ce56667 -s ours
am skip reason: Change-Id Ibf396e2d18d8b22cad50db290f3fd4e46ff85d9b with SHA-1 15303f2f67 is in history

Change-Id: I5349c92f3d0ddd30d5c1c6016c737cdcb4ebda3e
2020-03-20 00:17:03 +00:00
TreeHugger Robot
3b1ce56667 Merge "fastboot: add support for v3 boot header format" into rvc-dev 2020-03-20 00:01:50 +00:00
TreeHugger Robot
8d4383e728 Merge "[adb] Fix incremental installation on Windows" into rvc-dev am: ea1103cb1d
Change-Id: Id4fc8cd1430efd567f86acc22664c3f452e6fc6f
2020-03-19 22:19:48 +00:00
TreeHugger Robot
ea1103cb1d Merge "[adb] Fix incremental installation on Windows" into rvc-dev 2020-03-19 22:05:53 +00:00
Steve Muckle
b36934bf5f fastboot: add support for v3 boot header format
Support v3 header format when changing the command line with
fastboot boot or using flash:raw.

Bug: 151750405
Test: fastboot boot and flash:raw with updated cmdline and v3 header
Merged-In: Ibf396e2d18d8b22cad50db290f3fd4e46ff85d9b
Change-Id: Ibf396e2d18d8b22cad50db290f3fd4e46ff85d9b
2020-03-19 14:48:28 -07:00
TreeHugger Robot
c11bd89fe3 Merge "Enforce permission in native puller API." into rvc-dev am: 5a495becd0
Change-Id: I37715c5a1315f8767afe970ef35d2d855594115e
2020-03-19 21:36:52 +00:00
TreeHugger Robot
5a495becd0 Merge "Enforce permission in native puller API." into rvc-dev 2020-03-19 21:12:52 +00:00
TreeHugger Robot
80afce0b66 Merge "[adb data server] Initialize variable" into rvc-dev am: 126a1c2dd0
Change-Id: If01b50552b08160da93b4b6b3880133d17b3e2ed
2020-03-19 17:32:33 +00:00
TreeHugger Robot
126a1c2dd0 Merge "[adb data server] Initialize variable" into rvc-dev 2020-03-19 17:14:28 +00:00
Xin Li
14ebe4c17d DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master
Bug: 151763422
Change-Id: Ibbace08eb78d88b6ef77c22d8902428da36830ba
2020-03-19 10:10:44 -07:00
Yurii Zubrytskyi
67caf0ceef [adb] Print fewer progress messages for push/pull
Windows console IO is terribly slow. Reducing the number of
printed progress messages speeds up the transfer rate
from 80 to 130 MB/s on Windows laptop

Bug: 151900478
Test: adb push/pull
Change-Id: I223284c8a662bd8f2b8ba280cdcc8c930d3e5205
2020-03-19 00:21:08 -07:00
Treehugger Robot
7f71a87033 Merge "fastboot: add support for v3 boot header format" am: 3ab681c9a8 am: 7e3e65cc4b
Change-Id: I37bf625f75ed1fc885dcfd0ad83a00317ea3c1e4
2020-03-19 06:34:33 +00:00
Yurii Zubrytskyi
76820308c5 [adb] Optimize fdevent machinery
- Use one fewer heap allocation per fdevent object
- Lazy-init the fdevent context

Bug: 151239696
Test: various adb commands on Win/Linux

Change-Id: Ic7de207b30495e618f187e097c0276ad42c34005
2020-03-18 23:20:00 -07:00
Treehugger Robot
7e3e65cc4b Merge "fastboot: add support for v3 boot header format" am: 3ab681c9a8
Change-Id: Id838e3bb6cd3af28dece666a0f6d3de5aa183322
2020-03-19 06:13:06 +00:00
Treehugger Robot
3ab681c9a8 Merge "fastboot: add support for v3 boot header format" 2020-03-19 05:47:48 +00:00
Yurii Zubrytskyi
c3ac339daf [adb] Fix incremental installation on Windows
Use only the syscalls that work with the wrapped ADB fds, or
extract the native handles for the case when need to call one
not wrapped.

Bug: 151239696
Test: adb install --incremental <apk> on Windows
Change-Id: Ia6de620171ab696b8136dcb60a2b63af6f86419f
2020-03-18 22:28:01 -07:00
Kazuhiro Inaba
1cb0222787 Merge "healthd: Don't take device-scoped battery as the main system battery." am: f98ee05a17 am: 27888d5165
Change-Id: I9d60b3a31b765d172be9d6fa0a7a35e4bca4bf36
2020-03-19 05:12:15 +00:00
Kazuhiro Inaba
27888d5165 Merge "healthd: Don't take device-scoped battery as the main system battery." am: f98ee05a17
Change-Id: Ibaf8d7e1681d58cedf3dbcf725b82c525ea3b572
2020-03-19 04:48:39 +00:00
Kazuhiro Inaba
f98ee05a17 Merge "healthd: Don't take device-scoped battery as the main system battery." 2020-03-19 04:40:01 +00:00
Josh Gao
b567303330 adbd: add apex_available and visibility for internal libs.
abb links against libadbd_core for the shell protocol, and must be
on the system image because it links against cmd, so let's just
expose it to abb for now.

Bug: http://b/151398197
Test: treehugger
Change-Id: Id926bc4324d3259def21ea19d3bd72320311a6e3
2020-03-18 18:36:01 -07:00
Ryan Mitchell
42b59b4322 Merge "Allow loading zip at an offset in fd" am: ed22a0aa70 am: bbd087221f
Change-Id: I1f79abad23476b03e15aa6593235b2127bef7bc0
2020-03-18 23:41:15 +00:00
Tom Cherry
1079ce4221 [automerger skipped] storaged: ignore SIGPIPE am: 7e47915755 -s ours
am skip reason: Change-Id I633780ed20908be02e5e1dea9504e140932afc8c with SHA-1 3f3b1708d9 is in history

Change-Id: I0e97c8bc42e3f8bbdb55c3836002e0692a9b5129
2020-03-18 23:30:34 +00:00
Tom Cherry
c1dc5fbfd9 [automerger skipped] init: use a no-op signal handler instead of SIG_IGN for SIGPIPE am: 2bf886afc2 -s ours
am skip reason: Change-Id Ieda8555fd03836bcd672a422fe673a8369ad9beb with SHA-1 fd470e87cc is in history

Change-Id: Id8de43fec4736e007ffdb56d42a49e52ad94955f
2020-03-18 23:30:32 +00:00
Ryan Mitchell
bbd087221f Merge "Allow loading zip at an offset in fd" am: ed22a0aa70
Change-Id: I38b81c3af281feadd4ce5faaaf75dc2483df02b1
2020-03-18 23:26:16 +00:00
Ryan Mitchell
ed22a0aa70 Merge "Allow loading zip at an offset in fd" 2020-03-18 23:00:52 +00:00
Steve Muckle
15303f2f67 fastboot: add support for v3 boot header format
Support v3 header format when changing the command line with
fastboot boot or using flash:raw.

Bug: 151750405
Test: fastboot boot and flash:raw with updated cmdline and v3 header
Change-Id: Ibf396e2d18d8b22cad50db290f3fd4e46ff85d9b
2020-03-18 15:00:47 -07:00
Tom Cherry
7e47915755 storaged: ignore SIGPIPE
It is possible for storaged to terminate due to SIGPIPE if its clients
have terminated.  This is not a fatal condition from storaged's
perspective, so we ignore SIGPIPE instead.

Bug: 151581751
Test: build
Merged-In: I633780ed20908be02e5e1dea9504e140932afc8c
Change-Id: I633780ed20908be02e5e1dea9504e140932afc8c
(cherry picked from commit 3f3b1708d9)
2020-03-18 13:53:15 -07:00
Ryan Mitchell
23150e4fe4 Allow loading zip at an offset in fd
To allow the ResourcesLoader API to load part of a file as an APK
that contains resources, an additional override of OpenArchiveFd
that contains read offset and length as parameters must be created.

This functionality allows for an APK stored in a zip file to be read
without having to write the APK to disk.

Bug: 142716192
Test: atest FrameworksResourceLoaderTests
Change-Id: I772fc8b462d71de0529717c420ced552103a6e3f
Merged-In: I772fc8b462d71de0529717c420ced552103a6e3f
2020-03-18 20:46:50 +00:00
Ryan Mitchell
c7335769b1 Allow loading zip at an offset in fd
To allow the ResourcesLoader API to load part of a file as an APK
that contains resources, an additional override of OpenArchiveFd
that contains read offset and length as parameters must be created.

This functionality allows for an APK stored in a zip file to be read
without having to write the APK to disk.

Bug: 142716192
Test: atest FrameworksResourceLoaderTests
Change-Id: I772fc8b462d71de0529717c420ced552103a6e3f
Merged-In: I772fc8b462d71de0529717c420ced552103a6e3f
2020-03-18 13:39:49 -07:00
Tom Cherry
3af236f428 Merge "storaged: ignore SIGPIPE" am: b33afa9d8d am: 9713a0c25d
Change-Id: I1de2d07bc0efa93fdb6d0991f8ad11ab3a5cbbf4
2020-03-18 19:23:19 +00:00
Tom Cherry
9713a0c25d Merge "storaged: ignore SIGPIPE" am: b33afa9d8d
Change-Id: Ife5c8b8474bda37cd8eef6cf7cb6a6dffe35688e
2020-03-18 19:02:34 +00:00
Tom Cherry
b33afa9d8d Merge "storaged: ignore SIGPIPE" 2020-03-18 18:50:57 +00:00
Tom Cherry
2bf886afc2 init: use a no-op signal handler instead of SIG_IGN for SIGPIPE
We want to ignore SIGPIPE within init, but if we use SIG_IGN, that
would be inherited by child processes through exec(), which we do not
want to have happen.  We instead set up a real signal handler with a
no-op handler function, that will ignore SIGPIPE within init, but will
not be inherited across exec().

This fixes c29c2baa69 ("init: Add support for native service
registration with lmkd"), when SIG_IGN was introduced.
Note that we caught this issue before shipping a release with that
change, so the major motivation here is to not cause a behavior change
in init.

Bug: 151581751
Test: children of init that don't explicitly block SIGPIPE exit when
      sent SIGPIPE
Test: children of init that do explicitly block SIGPIPE do not exit
      when sent SIGPIPE
Test: init does not exit when sent SIGPIPE
Test: init exits when sent SIGABRT
Merged-In: Ieda8555fd03836bcd672a422fe673a8369ad9beb
Change-Id: Ieda8555fd03836bcd672a422fe673a8369ad9beb
(cherry picked from commit fd470e87cc)
2020-03-18 09:42:56 -07:00
Treehugger Robot
f3a923ee44 [automerger skipped] Merge "base: dlopen/dlsym for liblog when SDK_VER <= 29" am: cdb6003784 am: 09617a191d -s ours
am skip reason: Change-Id I7f7f16510d7637cd380fe35ea9ff3e804f38851d with SHA-1 22207e6590 is in history

Change-Id: I94c8af017e1ec20a2f5c8e89e499ec7fd36871c1
2020-03-18 16:40:41 +00:00
Treehugger Robot
09617a191d Merge "base: dlopen/dlsym for liblog when SDK_VER <= 29" am: cdb6003784
Change-Id: Ieefc8e083dbbcc266102deccbe1a2f25c2084863
2020-03-18 16:23:47 +00:00
Treehugger Robot
cdb6003784 Merge "base: dlopen/dlsym for liblog when SDK_VER <= 29" 2020-03-18 16:05:54 +00:00
Greg Kaiser
6a2c18a88f [adb data server] Initialize variable
servingComplete_ was left uninitialized and only set to 'true'
in the code.  We initialize it to the 'false' state to avoid
uninitialized references in SkipToRequest().

Bug: 150865433
Test: TreeHugger
Change-Id: Ia8a4d7135c432eb657543c5498fc9dbe8f4718b6
2020-03-18 06:18:10 -07:00
Jooyung Han
2d954136fa base: dlopen/dlsym for liblog when SDK_VER <= 29
libbase doesn't have to rely on dlopen/dlsym to use liblog's new symbols
when it is built for __ANDROID_SDK_VERSION__ > 29.

Bug: 150860940
Test: TARGET_BUILD_APPS="com.android.adbd com.android.resolv" m
      objdump -T ...shared_com.android.resolv/libbase.so | grep LIBLOG_R
        => should be none because resolv apex is targeting 29
      objdump -T ...shared_com.android.adbd/libbase.so | grep LIBLOG_R
        => should list all new symbols because adbd apex is targeting R
      objdump -T ...shared/libbase.so | grep LIBLOG_R
        => should list all new symbols

Merged-In: I7f7f16510d7637cd380fe35ea9ff3e804f38851d
Change-Id: I7f7f16510d7637cd380fe35ea9ff3e804f38851d
(cherry picked from commit 22207e6590)
2020-03-18 17:42:41 +09:00
Yurii Zubrytskyi
4e7bede912 Merge changes Ifda7de48,Ie33505f9 into rvc-dev am: c2872d831d
Change-Id: I632830b0a15bdada757230c2a1d6ec4f48ce51ee
2020-03-18 03:38:50 +00:00