Commit Graph

55342 Commits

Author SHA1 Message Date
Josh Gao 15f0402787 Merge "adb: fix use after free of atransport."
am: 1cdcc5f7e8

Change-Id: I07a1214ef5278b96adc0111fc2ae4c247fdc9015
2019-12-18 14:42:21 -08:00
Treehugger Robot 1cdcc5f7e8 Merge "adb: fix use after free of atransport." 2019-12-18 22:39:48 +00:00
Ruchir Rastogi b2aacf613e Merge "Simplified stats_event.c; exposed getter methods"
am: d054eb7310

Change-Id: Ifc4b4f28cdeb0b9d6f4d9caf8bce03515a932417
2019-12-18 14:29:38 -08:00
Treehugger Robot d054eb7310 Merge "Simplified stats_event.c; exposed getter methods" 2019-12-18 22:27:27 +00:00
Ruchir Rastogi fc9a804cab Merge changes I15abdf13,I70304168,I52b0cb8e
am: a23ce83a3b

Change-Id: I706cd1c1c940b9a3b2bd27db0181fe47eb565e08
2019-12-18 14:26:35 -08:00
Ruchir Rastogi 3ccb84e989 Merge "First draft of native StatsEvent API"
am: 5158ab9ff2

Change-Id: I6ea9f02d399d7f355dc68b16af8b5095787f4137
2019-12-18 14:25:56 -08:00
Treehugger Robot a23ce83a3b Merge changes I15abdf13,I70304168,I52b0cb8e
* changes:
  General cleanup; add support for key-value pairs
  Move type ids to stats_event.h
  Set default timestamp to elapsedRealtimeNanos
2019-12-18 22:17:30 +00:00
Treehugger Robot 5158ab9ff2 Merge "First draft of native StatsEvent API" 2019-12-18 22:17:23 +00:00
David Anderson 661ad4e54f init: Use ImageManager for DSUs.
The first_stage_mount code for DSUs predates both the DSU name and the
ImageManager abstraction. Move this code to ImageManager, so it can be
shared with overlayfs/scratch handling. And while we're here, rename GSI
to DSU for clarity.

Bug: 134949511
Test: dsu works
Change-Id: I9ef374bccc6cdbe2ada88baef4e7c0bc81b1e85e
2019-12-18 22:03:31 +00:00
Josh Gao 63da8e6272 adb: use poll instead of select in shell_service.
Bug: http://b/141955761
Test: test_device.py
Test: adbd_test
Change-Id: I8976304a1011e81e85f8d90d95d36ecd82834f5f
2019-12-18 14:02:57 -08:00
Ruchir Rastogi a38d5a6fd6 Simplified stats_event.c; exposed getter methods
Simplifications/changes:
(1) We remove the bufPos field and track the end of the buffer using
    only the size field.
(2) We rename put_<type>() functions to append_<type>() to signify that the
    value will be placed at the end of the buffer. We also move the
    increment of event->size to within the append_<type>() functions;
    this improves readability of the write_<type>() functions.
(3) We immediately write the timestamp and atom id to the buffer in
    order to simplify stats_event_build().
(4) We never check for null pointers; checking for null pointers
    delays errors and obfuscates the root problem.
(5) We change the the annotationId and numPairs parameters to be
    uint8_t's. This helps signify to clients that these values must fit
    in 1 byte.
(6) Clients no longer have to pass in the length of strings. Instead, we
    expect them to pass in null-terminated strings, and we will
    calculate the length outselves using strnlen.

Test: m -j libstatssocket
Change-Id: I6d192768876a23d7016173bcdaf59f8b7e92b182
Merged-In: I0173f8bc76ef25118379dce5d2481f5f7a9b7519
2019-12-18 13:17:36 -08:00
Ruchir Rastogi 3822e61d7b General cleanup; add support for key-value pairs
Encoding of key-value pairs follows strategy described in
go/statsd-socket-doc.

Fixed bug where timestamp and atom id were not contributing to the
number of fields in the buffer.

Note: Similar to ag/9603344, which was abandoned because of git rebasing
issues.

Test: m -j libstatssocket compiles
Bug: 143079361
Change-Id: I15abdf13ad8debf83ae1f6c372676db4fe390289
Merged-In: I8d23ddf2dbfee518ad970894ac09ba3ad5b5b4ad
2019-12-18 13:11:28 -08:00
Ruchir Rastogi a3bc1af1b8 Move type ids to stats_event.h
This allows the parsing code within statsd to access the type ids.
Also, we move stats_event.h to the include directory for consistency.

Test: m -j libstatssocket
Change-Id: I7030416872677f3a523c2baf7bf6bcb4ca0ae6a4
Merged-In: I1db7fc9e9d0efd2225612353a8fc49bb13220ff0
2019-12-18 11:58:42 -08:00
Ruchir Rastogi f4d23fc353 Set default timestamp to elapsedRealtimeNanos
Test: m -j libstatssocket compiles
Change-Id: I52b0cb8e1e916413db3dc0fe1b9a7e922833bdf7
Merged-In: I62f4c6bb14c3914124a6af25ff46fb0a980204e7
2019-12-18 11:53:38 -08:00
Ruchir Rastogi bb0da94f8d First draft of native StatsEvent API
Test: m -j libstatssocket compiles
Change-Id: I874968d4f77a5990764100123794b923847e5eb5
Merged-In: I0da9740d29749d79d14be39e5949b98c58df704d
2019-12-18 11:33:22 -08:00
Nikita Ioffe 9f473c0579 Don't proceed with userspace reboot if device doesn't support it
Test: set property to false and adb reboot userspace
Bug: 135984674
Change-Id: I11e55243df002dd54e533a6b9fc529866597d4dd
2019-12-18 18:06:47 +00:00
Songchun Fan 284962431b [incremental] create /data/incremental in init.rc
We use /data/incremental to keep all the directories that are mounted on
the Incremental File System.

Since system_server does not have permission to dynamically create dirs
directly under /data, we create /data/incremental in init.rc.

Test: boots
BUG: 136132412
Change-Id: Ic90cc8f652672a8d4459c0cd38db9c0872217af4
2019-12-18 09:26:51 -08:00
Elliott Hughes fa44dc0f5d Merge "Fix SEGV in libziparchive with malformed zip file."
am: 264a37d12f

Change-Id: I39c2ec3e0a1b81585f6c47620d7dec9687bbc9f7
2019-12-18 08:19:04 -08:00
Elliott Hughes 264a37d12f Merge "Fix SEGV in libziparchive with malformed zip file." 2019-12-18 16:14:54 +00:00
David Anderson 97c0ff6196 Merge "liblp: Add a VIRTUAL_AB_DEVICE flag for LpMetadataHeader."
am: 43ad6362da

Change-Id: Iadeecde4704d71e8190f8d4208605cf95c1acd63
2019-12-18 08:03:01 -08:00
David Anderson 0105ab5472 Merge "libfiemap: Fix fallocate() usage."
am: 42c86c763c

Change-Id: Ibb27516044e8a702abb03147f44be8222462a839
2019-12-18 08:02:43 -08:00
David Anderson 43ad6362da Merge "liblp: Add a VIRTUAL_AB_DEVICE flag for LpMetadataHeader." 2019-12-18 15:42:44 +00:00
David Anderson 42c86c763c Merge "libfiemap: Fix fallocate() usage." 2019-12-18 15:37:10 +00:00
Jason Jeremy Iman 0abe8e8126 Merge "Enable "localfilesystem" UNIX domain socket for ADB."
am: 90e9217aca

Change-Id: I74f877351e40cf37f0cc79867128487223d52465
2019-12-17 21:39:32 -08:00
Treehugger Robot 90e9217aca Merge "Enable "localfilesystem" UNIX domain socket for ADB." 2019-12-18 05:34:30 +00:00
Peter Collingbourne 683192270f Stop using weak symbols in libvndksupport.
These weak symbols are no longer necessary because we no longer
need to statically link libvndksupport.

Furthermore, these symbols are not really optional when libvndksupport is
dynamically linked. When the library is linked with --as-needed the linker
may drop the reference to libdl_android.so, which leads to a failure to boot.

Bug: 146456667
Change-Id: I4d2290d8d0206e0d89665d4d872a7c53b3e1531b
2019-12-17 17:52:05 -08:00
Josh Gao a48b41bcb8 debuggerd: switch to using platform headers for DEBUGGER_SIGNAL.
Test: treehugger
Change-Id: Ie9736c4a077dba1029d2352bd94d47ce07323aec
2019-12-17 16:36:05 -08:00
Yifan Hong 0cd761c347 Merge changes from topic "wait_for_merge"
am: 18c6248ffe

Change-Id: Ibccf63cfdaabb8610c24d2b2271d7cb3cda016f2
2019-12-17 15:04:34 -08:00
David Anderson 71b287bfd7 libfiemap: Fix fallocate() usage.
This fixes two bugs in how we use fallocate(). First, using ZERO_RANGE
is a mechanism to allocate holes, not blocks. Instead we should be
passing no flags.

The reason this code worked is because of our explicit writes to the
file, which is intended to defeat lazy block allocation. This is not
necessary for F2FS with proper file pinning support, so we now skip this
when possible.

Together, these fixes improve the speed of "adb remount" when backed
by libfiemap.

Bug: 134949511
Test: adb remount when backed by /data
Change-Id: I746053d183e0c83d56979d9c3fa6d96b40b5e478
2019-12-17 15:04:08 -08:00
Yifan Hong 18c6248ffe Merge changes from topic "wait_for_merge"
* changes:
  libsnapshot: add WaitForMerge
  libsnapshot: SnapshotUpdateTest::AddOperation
  libsnapshot: add GetCurrentSlot
2019-12-17 23:01:59 +00:00
Martijn Coenen 110a65c586 Merge "Revert "Have /storage always point to sdcardfs by default.""
am: bc58945cd1

Change-Id: I2fef30b72fecb51363b5d8be2bb73bbe73a7a152
2019-12-17 09:45:00 -08:00
Treehugger Robot bc58945cd1 Merge "Revert "Have /storage always point to sdcardfs by default."" 2019-12-17 17:38:47 +00:00
David Anderson 65615d00a9 Merge "fs_mgr: Move libfiemap back to fs_mgr from system/gsid."
am: 1526a46e92

Change-Id: I447ec99fe62a62dc6a248e424a6312720f6f5918
2019-12-17 09:35:23 -08:00
David Anderson 1526a46e92 Merge "fs_mgr: Move libfiemap back to fs_mgr from system/gsid." 2019-12-17 17:32:09 +00:00
Elliott Hughes fba2a1a1ec Fix SEGV in libziparchive with malformed zip file.
d77c99ebc3 changed MappedFile to return a
bogus zero-length mapping on failure rather than nullptr. None of the
calling code was changed, though, and it seems like doing so would be a
bad idea. Revert that part of the change.

Add missing tests, and tidy up some of the logging. Also remove
single-use or obfuscatory constants from the tests.

The new "empty.zip" was created by using zip(1) to create a zip file
with one entry, then using `zip -d` to remove it.

The new "zero-size-cd.zip" was created by using zip(1) to create a zip
file containing a single empty file, and then hex editing the two byte
"size of the central directory" field in the "end of central directory
record" structure at the end of the file. (This is equivalent to, but
much smaller than, the example zip file provided by the bug reporter.)

Bug: http://b/145925341
Test: treehugger
Change-Id: Iff64673bce7dae886ccbc9dd6c2bbe18de19f9d2
2019-12-17 08:39:09 -08:00
Martijn Coenen 0dbb2a75f2 Revert "Have /storage always point to sdcardfs by default."
This reverts commit 5d53bfce2d.

Reason for revert: for consistency, we've decided that for now, all code will have the same view of /storage: FUSE. Will address the TODO here later.

Change-Id: Ia75e23c91fb098f6309c160de2889f06507c3717
2019-12-17 13:45:10 +00:00
Nikita Ioffe 7fe4852d3f Merge "Unmount bind-mounts on top of /data before unmounting /data"
am: e4b931146d

Change-Id: I10980637aaa6b9184ce5d5f794cf09d04f9df60b
2019-12-17 04:11:23 -08:00
Nikita Ioffe e4b931146d Merge "Unmount bind-mounts on top of /data before unmounting /data" 2019-12-17 12:06:59 +00:00
Ed Chen 30fa1296a7 Merge "Revert "remount: Remove the "backing" parameter to fs_mgr_overlayfs_setup.""
am: 701abc3f14

Change-Id: Ib994b996736594a7b969c232549cec5a6814dcbb
2019-12-17 01:21:21 -08:00
Ed Chen 701abc3f14 Merge "Revert "remount: Remove the "backing" parameter to fs_mgr_overlayfs_setup."" 2019-12-17 09:18:53 +00:00
Ed Chen 1981401909 Revert "remount: Remove the "backing" parameter to fs_mgr_overlayfs_setup."
This reverts commit b20aa434a3.

Bug: 146403375
Reason for revert: broken build 6078429 on git_master on walleye-user

Change-Id: Idc3b1c0ad5228d63298ce84811624b23d0cea434
2019-12-17 08:53:13 +00:00
David Anderson f204fa2199 Merge "remount: Remove the "backing" parameter to fs_mgr_overlayfs_setup."
am: 905ecdd374

Change-Id: Idde723e169effc42bc8a8e0a063a8ee85daf4524
2019-12-16 23:01:54 -08:00
David Anderson 905ecdd374 Merge "remount: Remove the "backing" parameter to fs_mgr_overlayfs_setup." 2019-12-17 06:05:43 +00:00
David Anderson 4fe398018b fs_mgr: Move libfiemap back to fs_mgr from system/gsid.
Bug: 134949511
Test: builds
Change-Id: I07943acce5d4671975afef6d8da1bdbeef43c39d
2019-12-16 20:10:26 -08:00
Nikita Ioffe 0dda423dd0 Unmount bind-mounts on top of /data before unmounting /data
Test: adb shell setprop sys.init.userdata_remount.force_umount_f2fs 1
Test: adb shell /system/bin/vdc checkpoint startCheckpoint 1
Test: adb reboot userspace
Bug: 135984674
Bug: 143970043
Change-Id: Icd7f3ad1c42d9b21bf4eacf1dec60355c9883254
2019-12-16 23:22:55 +00:00
David Anderson 4ba68b6451 liblp: Add a VIRTUAL_AB_DEVICE flag for LpMetadataHeader.
Bug: 134949511
Test: liblp_test gtests
Change-Id: I8b376d0980e1372086ed15b980209f3726ef651a
2019-12-16 22:20:40 +00:00
Yifan Hong cb6c6ef123 Merge "fastboot: Flashall does proper snapshot cancel"
am: 48d3b1e112

Change-Id: I85fe4961bc8111acf2c2c4a37f45c9f539729905
2019-12-16 13:50:06 -08:00
Treehugger Robot 48d3b1e112 Merge "fastboot: Flashall does proper snapshot cancel" 2019-12-16 21:44:39 +00:00
Alessio Balsini bef67f9fd4 Helper function to mount snapshot devices in recovery
In recovery the user has the option to mount /system, but when a device
is updating with Virtual A/B, the _b partition may be a snapshot.
This patch introduces a helper function that satisfies the dependency of
setting up the snapshot devices required to mount /system.

Bug: 139157327
Test: manual /system partition mount on VAB device during OTA
Change-Id: I7337bdd38d7016d12d3ee42be1c7893b10e9116d
Signed-off-by: Alessio Balsini <balsini@google.com>
2019-12-16 21:24:25 +00:00
Elliott Hughes 8025cee478 Merge "Rename unzip.cpp to ziptool.cpp."
am: cd652ea3dc

Change-Id: Icefb783e8da17a4c985b6fef02d3c124d9e7892d
2019-12-16 10:41:05 -08:00