Tom Cherry
391f68a4e5
Merge "Require liblog for libbase in all configurations"
...
am: f633b62b63
2020-01-15 15:24:58 -08:00
Tom Cherry
f633b62b63
Merge "Require liblog for libbase in all configurations"
2020-01-15 23:20:07 +00:00
Nikita Ioffe
0d523b28cb
Merge "Don't reboot into recovery during userspace reboot"
...
am: 661c77be0f
2020-01-15 14:25:52 -08:00
Nikita Ioffe
661c77be0f
Merge "Don't reboot into recovery during userspace reboot"
2020-01-15 22:22:18 +00:00
Steven Moreland
0714a9eae2
Merge "libcutils: fallback to /dev/ashmem"
...
am: 6e016ef80e
2020-01-15 11:51:00 -08:00
Ricky Wai
3fabcf5fcf
Merge "Create /mnt/data_mirror/cur_profiles in init.rc"
...
am: ec7be0dc0f
2020-01-15 11:50:29 -08:00
Treehugger Robot
6e016ef80e
Merge "libcutils: fallback to /dev/ashmem"
2020-01-15 19:48:26 +00:00
Treehugger Robot
ec7be0dc0f
Merge "Create /mnt/data_mirror/cur_profiles in init.rc"
2020-01-15 19:47:52 +00:00
Nikita Ioffe
05506f05b6
Don't reboot into recovery during userspace reboot
...
In case one of the cryptfs calls to vdc fails, first try a normal
reboot.
Test: manual
Bug: 135984674
Bug: 143970043
Change-Id: I5706d9cd6c3a08fa06329ffb7d141de632620e3d
2020-01-15 16:27:39 +00:00
Tom Cherry
45f06c49fa
Merge "liblog: remove log_portability.h"
...
am: e2dad0a296
2020-01-15 08:12:29 -08:00
Tom Cherry
902c974556
Merge "liblog: use libbase_headers for TEMP_FAILURE_RETRY"
...
am: 2ea787137f
2020-01-15 08:11:51 -08:00
Tom Cherry
e2dad0a296
Merge "liblog: remove log_portability.h"
2020-01-15 16:10:30 +00:00
Tom Cherry
2ea787137f
Merge "liblog: use libbase_headers for TEMP_FAILURE_RETRY"
2020-01-15 16:09:45 +00:00
Nikita Ioffe
03fd199578
Merge "Change scope of ro.init.userspace_reboot.is_supported to public"
...
am: 60ddf3a29a
2020-01-15 06:18:01 -08:00
Nikita Ioffe
60ddf3a29a
Merge "Change scope of ro.init.userspace_reboot.is_supported to public"
2020-01-15 14:14:08 +00:00
Alessio Balsini
122035fd3a
Merge "Refactor update status management as protobuf"
...
am: 5c63dc9322
2020-01-15 06:07:46 -08:00
Martijn Coenen
4cde8c3eaa
Merge "Disable dm-verity hash prefetching."
...
am: e4505960b9
2020-01-15 06:05:48 -08:00
Treehugger Robot
5c63dc9322
Merge "Refactor update status management as protobuf"
2020-01-15 14:04:25 +00:00
Treehugger Robot
e4505960b9
Merge "Disable dm-verity hash prefetching."
2020-01-15 13:13:01 +00:00
Songchun Fan
bed2e0c828
Merge "[incrementa;] set mode and encryption for /data/incremental"
...
am: f7593a9a2a
2020-01-14 19:06:25 -08:00
Treehugger Robot
f7593a9a2a
Merge "[incrementa;] set mode and encryption for /data/incremental"
2020-01-15 02:58:02 +00:00
Steven Moreland
22197eaea7
Merge "remove deprecated bp 'subdirs'"
...
am: aba02dbe6e
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
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
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
2020-01-14 14:18:23 -08:00
Tom Cherry
f06cfd7fe4
storaged: replace LOG_TO() macros with LOG()
...
am: b8c1147c4a
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
Steven Moreland
4f99dd3af1
libcutils: fallback to /dev/ashmem
...
For a Q APEX built with use_vendor, rather than using AIDL to talk to
ashmemd, it would directly open /dev/ashmem. R libcutils does ashmem
differently, but in order to allow R-built APEXes to replace this
category of APEXes, falling back to /dev/ashmem.
Fixes: 147363115
Test: tested on Q in swcodec APEX
Change-Id: I625e46b15fee6649251ab9be7a1bbe11c5427525
2020-01-14 18:19:10 +00:00
Tom Cherry
02ff976065
liblog: remove log_portability.h
...
__BEGIN_DECLS and __END_DECLS are all that are left, and I can compile
with using normal <sys/cdefs.h>, so hopefully we can remove this at
last.
Test: build
Change-Id: I6df7ef0da027bb91c98806e0f9661d7416ebaa5d
2020-01-14 09:56:30 -08:00
Tom Cherry
121292dd81
liblog: use libbase_headers for TEMP_FAILURE_RETRY
...
Test: build
Change-Id: Id3b57ff0327d4632e91960e5e70f3aa21992ed15
2020-01-14 09:56:25 -08:00
Nikita Ioffe
10cdc17283
Change scope of ro.init.userspace_reboot.is_supported to public
...
Test: atest CtsUserspaceRebootHostSideTestCases
Test: m checkbuild
Bug: 135984674
Change-Id: Ie11c6720ee21afef99b4b53415da00d8c1e446ca
2020-01-14 12:42:48 +00:00
Nikita Ioffe
bfc9b81a79
Merge "Reduce log spam when unmounting /data"
...
am: 07892ea610
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
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
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
2020-01-13 15:05:42 -08:00
Songchun Fan
73d9e7d666
[incrementa;] set mode and encryption for /data/incremental
...
To be consistent with /data/app.
Test: boots
BUG: 137855266
Change-Id: I8aa549155367edfad158924bcf7892ac7bb76f16
2020-01-13 15:04:41 -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
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
