Commit graph

55409 commits

Author SHA1 Message Date
Steven Moreland
22197eaea7 Merge "remove deprecated bp 'subdirs'"
am: aba02dbe6e

Change-Id: I76fa69b2a3e68e3a1df3bf3fe233d84ff4bf4423
2020-01-14 18:02:25 -08:00
Treehugger Robot
aba02dbe6e Merge "remove deprecated bp 'subdirs'" 2020-01-15 01:37:27 +00:00
Yifan Hong
d12410d2f9 Merge "fastboot: Mount /metadata before overlayfs teardown."
am: 38f3706ab3

Change-Id: Ibe451d178c80a040773fbd929cb1949db5737469
2020-01-14 17:33:39 -08:00
Yifan Hong
38f3706ab3 Merge "fastboot: Mount /metadata before overlayfs teardown." 2020-01-15 01:31:59 +00:00
Peter Collingbourne
bba5ea0622 Merge "Add unique_fd::operator{==,!=} overloads that take a unique_fd."
am: 9ef741ccac

Change-Id: Ie361658e875008f06bb8d50e476ce0c9ef377aa6
2020-01-14 17:25:44 -08:00
Peter Collingbourne
9ef741ccac Merge "Add unique_fd::operator{==,!=} overloads that take a unique_fd." 2020-01-15 01:24:01 +00:00
Tom Cherry
a5d5040108 Merge changes from topic "remove-log_to"
am: acd17330df

Change-Id: I910aa933ac8a1393c1bcac56b5cc12c1602c2095
2020-01-14 14:18:23 -08:00
Tom Cherry
f06cfd7fe4 storaged: replace LOG_TO() macros with LOG()
am: b8c1147c4a

Change-Id: I75b9569172694f57951a4462e57e36dbee702e72
2020-01-14 14:18:18 -08:00
Tom Cherry
acd17330df Merge changes from topic "remove-log_to"
* changes:
  base: remove LOG_TO(), PLOG_TO() and LOG_STREAM_TO() macros
  storaged: replace LOG_TO() macros with LOG()
2020-01-14 22:16:57 +00:00
Steven Moreland
e40e4270e8 remove deprecated bp 'subdirs'
noticed some, so thought I would remove them everywhere here

Bug: N/A
Test: N/A
Change-Id: I2978673b158d6c253914ea22f7f0129e446a5f91
2020-01-14 12:18:40 -08:00
Nikita Ioffe
bfc9b81a79 Merge "Reduce log spam when unmounting /data"
am: 07892ea610

Change-Id: I4173e8eb101bee8affa77ce9e6b5bafe3181d1bd
2020-01-14 02:07:06 -08:00
Nikita Ioffe
07892ea610 Merge "Reduce log spam when unmounting /data" 2020-01-14 10:05: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
Peter Collingbourne
cc9566b6df Add unique_fd::operator{==,!=} overloads that take a unique_fd.
With C++20, any use of the existing overloads with two unique_fd
arguments is likely to become ambiguous:
http://lists.llvm.org/pipermail/cfe-commits/Week-of-Mon-20200113/301880.html

Newer versions of clang complain about this ambiguity. Fix the error by
adding overloads that take two unique_fds.

Bug: 145916209
Change-Id: I18a292827d8841b6d24f948682123ab54dc7aaca
2020-01-13 18:44:11 -08: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
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
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
Tom Cherry
d044eaa4e7 base: remove LOG_TO(), PLOG_TO() and LOG_STREAM_TO() macros
There were only two users of these and both of them were better off
setting up a default logger.

These macros are not particularly useful as it's not useful for a
single program to write to both the MAIN and SYSTEM logs.  In fact,
the opposite of these macros would be more beneficial: having more
programs write to only the MAIN or only the SYSTEM buffer, so getting
rid of these macros removes a temptation for bad behavior.

Users that absolutely need to do this behavior can still use the
liblog macros or functions, but that should be an extreme edge case,
such as the few programs that write to the CRASH buffer and does not
need to exist in libbase.

Bug: 119867234
Test: build
Change-Id: I23369c3b48ed636b617220cab47f77fdd5559763
2020-01-13 09:29:15 -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
Nikita Ioffe
b03e0cffd4 Reduce log spam when unmounting /data
We are only interested in unmount that failed.

Test: /system/bin/vdc checkpoint startCheckpoint 1
Test: adb reboot userspace
Bug: 135984674
Bug: 147584366
Bug: 143970043
Change-Id: I9e0b174785fbaf76a95b13457a80765bfa856518
2020-01-13 16:05:07 +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
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
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
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
Tom Cherry
b8c1147c4a storaged: replace LOG_TO() macros with LOG()
Storaged always writes to the SYSTEM log, so instead of using
LOG_TO(), it can use the normal LOG() macros as long as it calls
InitLogging() with a default to the SYSTEM log.

Test: storaged writes to the SYSTEM log still
Change-Id: I47e63bc92d55f9b1262a67e3508601ddbd9edc87
2020-01-10 17:10:58 -08: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
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
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
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
Alessio Balsini
b0b9c714d3 Add balsini@ as libsnapshot owner
Add balsini@ as libsnapshot owner to cover EMEA timezone.

Bug: n/a
Test: n/a
Change-Id: I2d5c900c62f202db2432df87f7847b0133872443
Signed-off-by: Alessio Balsini <balsini@google.com>
2020-01-09 10:11:45 +00:00
Elliott Hughes
3eae3ca9d3 Merge "adb: fix adb connect help typo."
am: f5a329f1a4

Change-Id: If8a62fd4cad973fe5bffda869c59cd1dc26fa96b
2020-01-08 20:37:11 -08:00
Treehugger Robot
f5a329f1a4 Merge "adb: fix adb connect help typo." 2020-01-09 04:34:27 +00:00
Woody Lin
2af792be76 Merge "InitFatalReboot: Panic the system if init_fatal_panic is "true""
am: d377ad8b06

Change-Id: I0c7dd0272adeaa0d85f3d2d7064e75e7381a777e
2020-01-08 18:13:24 -08:00
Woody Lin
d377ad8b06 Merge "InitFatalReboot: Panic the system if init_fatal_panic is "true"" 2020-01-09 02:11:52 +00:00
Tom Cherry
b47aa2a592 liblog: remove more unused code
Cleanup the headers; we really don't want to encourage any more
cutils/list.h usage...

Remove __android_log_uid() since the only remaining users are built
for device, so they can just use getuid() directly.

Test: build
Change-Id: I62be2c1e43d83807deaa9342afcc72459947cf15
2020-01-08 17:11:09 -08:00
Tom Cherry
21bb36c66a liblog: remove the last of the transport structs
Test: build, liblog unit tests
Change-Id: I292662fc64e3163b570c5daeaa8f912fb6ca74e8
2020-01-08 17:11:06 -08:00