Commit graph

57299 commits

Author SHA1 Message Date
Automerger Merge Worker
e7fbe55a98 Merge "Use sequence number to check if to reload atrace tags." am: 445234c76c am: d371ad8665 am: 0549118e91
Change-Id: I364d217f7447b7b4f4cf7c042e9f26844e245d46
2020-01-14 10:10:44 +00:00
Automerger Merge Worker
0549118e91 Merge "Use sequence number to check if to reload atrace tags." am: 445234c76c am: d371ad8665
Change-Id: Ic57e29442cfc905444a4f14983a39aa67e01a80c
2020-01-14 09:56:33 +00:00
Florian Mayer
d371ad8665 Merge "Use sequence number to check if to reload atrace tags."
am: 445234c76c

Change-Id: Idccf520a3b3c06923f99a9a342111212fedaf358
2020-01-14 01:38:28 -08:00
Florian Mayer
445234c76c Merge "Use sequence number to check if to reload atrace tags." 2020-01-14 09:37:04 +00:00
Automerger Merge Worker
0ff4f8097e Merge "Merge VtsFiemapWriterTest into fiemap_writer_test" am: b5c0ad7b21 am: d4f2250049 am: 35479c6218
Change-Id: I3bc9b1b1c80871a1b15114e391e179e690f05d5e
2020-01-14 00:49:12 +00:00
Automerger Merge Worker
35479c6218 Merge "Merge VtsFiemapWriterTest into fiemap_writer_test" am: b5c0ad7b21 am: d4f2250049
Change-Id: Idbb340d58e9ad805dbdb004185810a73081625c0
2020-01-14 00:37:10 +00:00
Yifan Hong
d4f2250049 Merge "Merge VtsFiemapWriterTest into fiemap_writer_test"
am: b5c0ad7b21

Change-Id: I3de63df53c7808844fef6844ab25b9ab81d34ff5
2020-01-13 16:23:57 -08:00
Yifan Hong
b5c0ad7b21 Merge "Merge VtsFiemapWriterTest into fiemap_writer_test" 2020-01-14 00:11:14 +00:00
Automerger Merge Worker
55cdc37d73 Merge "init: document interface_* commands and ctl.* actions" am: b7c68f777b am: bac044210e am: b8efd1b927
Change-Id: Ie35c0de09c5fd2b28aebeed21b88e587777f68ed
2020-01-13 23:32:39 +00:00
Automerger Merge Worker
b8efd1b927 Merge "init: document interface_* commands and ctl.* actions" am: b7c68f777b am: bac044210e
Change-Id: Ie953a11638b2326d511b69fdafe30b83f843b7e1
2020-01-13 23:20:42 +00:00
Tom Cherry
bac044210e Merge "init: document interface_* commands and ctl.* actions"
am: b7c68f777b

Change-Id: I1073b9efd28b191d94e77b821c90dd8b2e3a374f
2020-01-13 15:05:42 -08:00
Treehugger Robot
b7c68f777b Merge "init: document interface_* commands and ctl.* actions" 2020-01-13 22:41:44 +00:00
Yifan Hong
d90c32fbe2 Merge VtsFiemapWriterTest into fiemap_writer_test
Delete AndroidTest.xml for VtsFiemapWriterTest and use auto-generated
test config for fiemap_writer_test.

Also add fiemap_writer_test to vts-core and device-tests.

Also require_root for fiemap_writer_test.

Test: atest fiemap_writer_test
Fixes: 144300653
Change-Id: Ifc3808ea56331809b58f0c02de2caac250d78352
2020-01-13 13:53:17 -08:00
Automerger Merge Worker
9efde2e984 Merge "Remove leftover support for target-as-host" am: 5688181a11 am: dfe4a19f7e am: 54d6cdeba5
Change-Id: Id783a994dd1b01bbe3d5cab9a03d70b965cec94f
2020-01-13 20:50:43 +00:00
Automerger Merge Worker
54d6cdeba5 Merge "Remove leftover support for target-as-host" am: 5688181a11 am: dfe4a19f7e
Change-Id: If64300a3e07d504fa9e2ea9c5761a9fcd0d7970d
2020-01-13 20:34:19 +00:00
Kevin Brodsky
dfe4a19f7e Merge "Remove leftover support for target-as-host"
am: 5688181a11

Change-Id: Ib87b5eaffd36e9e7ff6faafd5682ff34df5a4107
2020-01-13 12:18:54 -08:00
Treehugger Robot
5688181a11 Merge "Remove leftover support for target-as-host" 2020-01-13 20:15:27 +00:00
Tom Cherry
504eb85f9d init: document interface_* commands and ctl.* actions
Test: n/a
Change-Id: Ided7e16a00142e7235edeef3be2eddb6bb751bfc
2020-01-13 09:45:08 -08:00
Florian Mayer
b06766cbbf Use sequence number to check if to reload atrace tags.
This is to deprecate the sysprop change notification in atrace.
After this change, processes will only update their enabled tags
at the first atrace event. Previously we reloaded the tags as a
result of the sysprop changed Binder notification, which woke up
every process in the system.

Test: adb shell su root atrace -t 10 ss
Test: #define ATRACE_SHMEM 0; adb shell su root atrace -t 10 ss

Bug: 137366208

Change-Id: Idffba5fd4ba23fba2f6b9f594365df68ac0c1626
2020-01-13 17:02:58 +00:00
Kevin Brodsky
0b633d8800 Remove leftover support for target-as-host
Support for target-as-host was removed by 4626b71057 ("Fix win_sdk
build."), so ADB_HOST_ON_TARGET is never defined.

Test: build
Change-Id: I5ab27e68208677266e2e4272bc2bae7d6a097c5d
2020-01-13 14:48:49 +00:00
Automerger Merge Worker
fb474ccdaa Merge "Add more logging to fs_mgr_remount_userdata_into_checkpoint" am: 860e8682e2 am: 45778d2773 am: 6a957a1dac
Change-Id: Ida04623162f7e426a00ebf3135ccda5ca6d0bf7a
2020-01-13 13:32:51 +00:00
Automerger Merge Worker
6a957a1dac Merge "Add more logging to fs_mgr_remount_userdata_into_checkpoint" am: 860e8682e2 am: 45778d2773
Change-Id: Iea0dbc073dd9362c38e6e46c6e40dde7bb077f0c
2020-01-13 13:16:25 +00:00
Nikita Ioffe
45778d2773 Merge "Add more logging to fs_mgr_remount_userdata_into_checkpoint"
am: 860e8682e2

Change-Id: I33faa03e8a2a8c041cdbc53a1f034d8d03e40fc0
2020-01-13 05:01:44 -08:00
Nikita Ioffe
860e8682e2 Merge "Add more logging to fs_mgr_remount_userdata_into_checkpoint" 2020-01-13 12:30:49 +00:00
Automerger Merge Worker
8d69a2ab29 Merge "init: Bind mount /mnt/installer early for scoped storage." am: 644d6a1e2e am: 90dac782a2 am: b8b7a10d15
Change-Id: I06effcc4320aea3e6aee662f40c8ba9415a518c0
2020-01-13 09:26:29 +00:00
Automerger Merge Worker
b8b7a10d15 Merge "init: Bind mount /mnt/installer early for scoped storage." am: 644d6a1e2e am: 90dac782a2
Change-Id: I956d169cc01f3b6a32bc3cc1a2583bbcdc2d1a86
2020-01-13 09:15:24 +00:00
Automerger Merge Worker
5ef1545469 Merge "Add /system/lib to the permitted paths for ns of APEXes" am: a6379cd2df am: 6a027535b0 am: 0549adb342
Change-Id: I9e5497a662e053754c9412a7668f0fd63210872e
2020-01-13 09:08:42 +00:00
Martijn Coenen
90dac782a2 Merge "init: Bind mount /mnt/installer early for scoped storage."
am: 644d6a1e2e

Change-Id: If5f113c475bb84a1d15b952d325b5755e11e48a1
2020-01-13 01:02:15 -08:00
Automerger Merge Worker
0549adb342 Merge "Add /system/lib to the permitted paths for ns of APEXes" am: a6379cd2df am: 6a027535b0
Change-Id: Idc55fc33e9e95127b872505bed8f3bd91c8c4c8e
2020-01-13 08:31:46 +00:00
Treehugger Robot
644d6a1e2e Merge "init: Bind mount /mnt/installer early for scoped storage." 2020-01-13 08:27:44 +00:00
Jiyong Park
6a027535b0 Merge "Add /system/lib to the permitted paths for ns of APEXes"
am: a6379cd2df

Change-Id: I7fd9f53d46133f9be7757a8d54b06104c034dc7b
2020-01-13 00:22:17 -08:00
Treehugger Robot
a6379cd2df Merge "Add /system/lib to the permitted paths for ns of APEXes" 2020-01-13 08:19:23 +00:00
Martijn Coenen
c70c0665fc init: Bind mount /mnt/installer early for scoped storage.
Scoped storage has some unique requirements that are hard to implement
with the two mount namespaces, because the daemon that does the mounting
(vold) lives in a different namespace than the processes using those
mounts.

In particular, /mnt/installer is a special bind mount that should
receive mount events under /mnt/user, but at the same time only
only propagate mount events under /mnt/installer to /mnt/installer in
the other namespace. More details in the code.

Bug: 134706060
Test: /mnt/installer shows up and is setup correctly.
Change-Id: I6dab5ace5a345d9d684a9f1ae94c833fc294d49e
2020-01-11 15:07:21 +01:00
Dan Shi
18e6487cfe Merge "Add libc++ as static library" am: 679185dc88 am: 003672e013
am: 064070c633

Change-Id: I7e751fd58560cfe45d01f4e1b0509726c9dc785a
2020-01-10 11:39:31 -08:00
Automerger Merge Worker
064070c633 Merge "Add libc++ as static library" am: 679185dc88 am: 003672e013
Change-Id: I76e968b211870d32c752f9db9824b9454a22b3d0
2020-01-10 18:41:56 +00:00
Dan Shi
003672e013 Merge "Add libc++ as static library"
am: 679185dc88

Change-Id: I36ba918f45352256d36c72d5f30f50672993e825
2020-01-10 10:32:08 -08:00
Treehugger Robot
679185dc88 Merge "Add libc++ as static library" 2020-01-10 18:30:25 +00:00
Nikita Ioffe
cb0c92e66d Add more logging to fs_mgr_remount_userdata_into_checkpoint
Sometimes unmounting userdata fails, this should help in debugging.
Ideally this information should be persisted somewhere so that we can
add it to the bugreport, but so far I don't have solution better than
writing it to a file in /metadata partition.

Test: adb reboot userspace
Bug: 135984674
Bug: 143970043
Change-Id: I92489600bf31f7f47b8b87de7cd4a882be21910e
2020-01-10 17:41:54 +00:00
Automerger Merge Worker
044669fa56 Merge "Add balsini@ as libsnapshot owner" am: 84ef7f65e8 am: 30b4536053 am: 6f7f1f9697
Change-Id: I0f92393cf53ac51ac9015c4d1687454cd2e613e7
2020-01-10 11:37:11 +00:00
Automerger Merge Worker
6f7f1f9697 Merge "Add balsini@ as libsnapshot owner" am: 84ef7f65e8 am: 30b4536053
Change-Id: I5af100030069e1cc6e4cecb41c05eb14c47bb4e4
2020-01-10 11:17:38 +00:00
Yifan Hong
30b4536053 Merge "Add balsini@ as libsnapshot owner"
am: 84ef7f65e8

Change-Id: Id4cea7047a3e60d79d1a0dbf5f3e220c2de26909
2020-01-10 03:02:28 -08:00
Yifan Hong
84ef7f65e8 Merge "Add balsini@ as libsnapshot owner" 2020-01-10 10:28:42 +00:00
TreeHugger Robot
d37759086f Merge "Remove extra indirection in native puller API" 2020-01-10 08:29:37 +00:00
Dan Shi
754167b241 Add libc++ as static library
This is for the test to run without packaging libc++.so in vts-core
suite.

Bug: 147249791
Test: atest FastbootVerifyUserspaceTest
Change-Id: I0263d13a2dd08186502b30b2fad25d4f0f3a6be8
2020-01-09 14:24:23 -08:00
Tej Singh
7e1b190832 Remove extra indirection in native puller API
The indirection is unneeded since we already take a function pointer.

Test: builds
Change-Id: Ice426d7dcb090aaf87a377ede233a4eb18f5eb30
2020-01-09 11:53:53 -08:00
Ruchir Rastogi
d9c638514c Merge "stats_event.h/c tests" 2020-01-09 19:29:04 +00:00
Automerger Merge Worker
722fb13c79 Merge changes I62be2c1e,I292662fc am: e92461d802 am: a57b9d705d am: fded39ad71
Change-Id: I71b1275b451728bc0a020e0d32a0294133cf25e2
2020-01-09 19:08:23 +00:00
Automerger Merge Worker
fded39ad71 Merge changes I62be2c1e,I292662fc am: e92461d802 am: a57b9d705d
Change-Id: I1622d28795ecaa64ea369f171ff3c284e4bd8ebd
2020-01-09 18:47:34 +00:00
Tom Cherry
a57b9d705d Merge changes I62be2c1e,I292662fc
am: e92461d802

Change-Id: Ic18f80aeddb9ec97fe6383196c3693ced64da45c
2020-01-09 10:32:21 -08:00
Tom Cherry
e92461d802 Merge changes I62be2c1e,I292662fc
* changes:
  liblog: remove more unused code
  liblog: remove the last of the transport structs
2020-01-09 18:29:54 +00:00