Commit graph

53818 commits

Author SHA1 Message Date
Yifan Hong
3d613876e9 Merge "libsnapshot: Only EnsureImageManager when it is needed."
am: 81a0738c68

Change-Id: I6b95cf1a731c4dc09a7897f3114e2ad6595d60bb
2019-10-24 14:52:19 -07:00
Yifan Hong
81a0738c68 Merge "libsnapshot: Only EnsureImageManager when it is needed." 2019-10-24 21:32:58 +00:00
Josh Gao
b555d6ba5d Merge changes from topics "adbd_reboot", "adbd_verity"
am: 18bbb2d821

Change-Id: Ie53f91b3e381bc4c8b1ab4afe8c66a82fc29bc73
2019-10-24 14:31:59 -07:00
Josh Gao
0d6c43bcf2 Move enable-verity/disable-verity out of adb to a helper binary.
am: f61f41494e

Change-Id: I04d51685d97beb1d481693823e35781243ecce8a
2019-10-24 14:31:51 -07:00
Josh Gao
2900290499 Use adbd_system_binaries to track adbd's dependencies.
am: 7b7ee191dc

Change-Id: Iad5c3797db17e27c311e787a8879a7ea7793f466
2019-10-24 14:31:41 -07:00
Josh Gao
18bbb2d821 Merge changes from topics "adbd_reboot", "adbd_verity"
* changes:
  adb: replace reboot service with exec of /system/bin/reboot.
  Move enable-verity/disable-verity out of adb to a helper binary.
  Use adbd_system_binaries to track adbd's dependencies.
2019-10-24 20:29:25 +00:00
Xin Li
20f301104b Merge "Skip QD1A.190821.011 in stage-aosp-master" into stage-aosp-master 2019-10-24 17:01:30 +00:00
Alessio Balsini
11792adea5 Merge "libsnapshot: MapCowImage returns the COW device path"
am: 2c7ae59ede

Change-Id: I73f9d83794ad086ed3e2887a39e102a4c096bfcb
2019-10-24 05:27:04 -07:00
Treehugger Robot
2c7ae59ede Merge "libsnapshot: MapCowImage returns the COW device path" 2019-10-24 12:15:41 +00:00
Yifan Hong
19b6f5f47e libsnapshot: Only EnsureImageManager when it is needed.
In functions / code paths where images_ is not used,
don't call EnsureImageManager.

Test: libsnapshot_test
Test: sideload on retrofit
Bug: 140749209
Change-Id: I36635e43b8c2e1c22524f8f4685a216d74c71ad7
2019-10-23 19:51:33 -07:00
David Anderson
a7d6d7bcc3 Merge "avoid data overflow in low memory device"
am: 376f04e047

Change-Id: I173dbb78fc7e03cf6f8cc09d285a7815434d6ce2
2019-10-23 16:22:53 -07:00
David Anderson
376f04e047 Merge "avoid data overflow in low memory device" 2019-10-23 23:15:06 +00:00
Steven Moreland
97bda3eb19 Merge "host_init_verifier: use libhidlmetadata"
am: 5d9cdae3f3

Change-Id: I607fb5adc2f5e1a851b481a0feedcdd9e2e167c3
2019-10-23 16:14:16 -07:00
Josh Gao
4818e210cc Merge "deployagent: set sdk version."
am: 581f8e2a5a

Change-Id: I2ee5d6cb3e3f6938ce85c4c7d9955e91a672129a
2019-10-23 16:12:34 -07:00
Steven Moreland
5d9cdae3f3 Merge "host_init_verifier: use libhidlmetadata" 2019-10-23 23:07:30 +00:00
Treehugger Robot
581f8e2a5a Merge "deployagent: set sdk version." 2019-10-23 22:59:56 +00:00
Tom Cherry
2b19109d2c Merge "Revert "liblog: remove mistakenly added symbols from vndk""
am: 9a3ebd2d54

Change-Id: I542cb1616b8499465d4f0ee600c9c769e0f8b54f
2019-10-23 15:25:33 -07:00
Tom Cherry
2c9ac318ec Merge "init: only provide control message results for devices launching > Q"
am: 0b482ad25b

Change-Id: Ice82dbf88fb37c4c8d0c7efb46a7edc8472a81b1
2019-10-23 15:24:43 -07:00
Josh Gao
f61f41494e Move enable-verity/disable-verity out of adb to a helper binary.
Test: adb enable-verity
Test: adb disable-verity
Test: adb shell enable-verity
Test: adb shell disable-verity
Test: fs_mgr/tests/adb-remount-test.sh
Change-Id: I0f21a6678b332cc9166d912aa38952d50d924566
2019-10-23 14:33:36 -07:00
Josh Gao
7b7ee191dc Use adbd_system_binaries to track adbd's dependencies.
required doesn't propagate from apexes, so we need a separate phony
target to track adbd's dependenecies.

Test: m
Change-Id: I4c97047dbd1c2f9b394d864aed229798f09fc9b1
2019-10-23 14:33:36 -07:00
Josh Gao
2c356bb91e adb: replace reboot service with exec of /system/bin/reboot.
Test: adb reboot
Test: adb reboot fastboot
Change-Id: Ia4146dde7ef3ae00a782dbe68aff166d63eabdb9
2019-10-23 14:33:36 -07:00
Tom Cherry
9a3ebd2d54 Merge "Revert "liblog: remove mistakenly added symbols from vndk"" 2019-10-23 20:47:27 +00:00
Tom Cherry
0b482ad25b Merge "init: only provide control message results for devices launching > Q" 2019-10-23 19:52:07 +00:00
Tom Cherry
350164cc7c Revert "liblog: remove mistakenly added symbols from vndk"
This reverts commit 5f8162b086.

Reason for revert: Turns out they're being used.

Merged-In: Iad9010190c7a4140b69dc553df5debdd88dcf81a
Change-Id: Iad9010190c7a4140b69dc553df5debdd88dcf81a
2019-10-23 11:39:13 -07:00
Tom Cherry
7e6ef6527b Merge "liblog: remove mistakenly added symbols from vndk"
am: cc4bf6538b

Change-Id: I25e8256091dbf3b2d2a3e0c7374a4d43df311395
2019-10-23 08:26:51 -07:00
Tom Cherry
cc4bf6538b Merge "liblog: remove mistakenly added symbols from vndk" 2019-10-23 15:14:25 +00:00
Tom Cherry
5310db82b0 init: only provide control message results for devices launching > Q
This is a behavior change and may have unintended consequences,
especially in Java, where failed property sets create exceptions.
Therefore, we only provide this new behavior to devices launching > Q.

Bug: 137070994
Test: build
Change-Id: If0b44aedc5c887ea6ea16dd3ec551ac2bf793cef
2019-10-23 08:09:56 -07:00
Elliott Hughes
dd8f749a60 Merge "libziparchive: add trivial fuzzer."
am: 986aaaaaa4

Change-Id: I80acba4e05eeacce69f80375c3410e966953c1e8
2019-10-23 08:07:56 -07:00
Elliott Hughes
986aaaaaa4 Merge "libziparchive: add trivial fuzzer." 2019-10-23 14:54:54 +00:00
JeiFeng Lee
ba117304ab avoid data overflow in low memory device
Bug: 142294642
Test: fastboot flash system system.img
Change-Id: Iec50817aaca5d31c194f0fdf409503829d14ca06
2019-10-23 13:20:41 +08:00
Yifan Hong
bad91a3fb8 Merge "[REFACTOR] healthd: BatteryMonitor::update split into 3 funcs"
am: 27de4e4a4a

Change-Id: I391bed7dc08227e5e83a8098b2d230ebf41f3b5d
2019-10-22 16:08:34 -07:00
Yifan Hong
27de4e4a4a Merge "[REFACTOR] healthd: BatteryMonitor::update split into 3 funcs" 2019-10-22 22:47:39 +00:00
Elliott Hughes
f66460b92a libziparchive: add trivial fuzzer.
Didn't find anything when I ran it, but it did get me to fix the
const/non-const void* in the API.

Test: treehugger
Change-Id: If3849d974965e3e5ffcbdaf5e47921316d717410
2019-10-22 11:45:49 -07:00
Christopher Ferris
ec79999dbf Merge "Fix handling of PT_GNU_EH_FRAME."
am: d76932ffa5

Change-Id: I16feaafc91550f748e0965d9cb8c2f79688f6ab5
2019-10-22 10:51:53 -07:00
Christopher Ferris
d76932ffa5 Merge "Fix handling of PT_GNU_EH_FRAME." 2019-10-22 17:26:59 +00:00
Tom Cherry
7867721e51 liblog: remove mistakenly added symbols from vndk
These functions and headers were all mistakenly added to the vndk.
They should not be used by vendors.

Test: these symbols do not appear in vendor libraries
Merged-In: I03919b437c2d9f0e573b7a6b40249ed12fe874b9
Change-Id: I03919b437c2d9f0e573b7a6b40249ed12fe874b9
2019-10-22 09:47:45 -07:00
Max Spector
295f631a6b Merge "Liblogd log fuzzer"
am: 1e07245bf1

Change-Id: I78ecc01acd0e29067b3b9a7ebd3a088cf484c795
2019-10-21 22:14:20 -07:00
Treehugger Robot
1e07245bf1 Merge "Liblogd log fuzzer" 2019-10-22 05:02:11 +00:00
Christopher Ferris
5838e53b97 Fix handling of PT_GNU_EH_FRAME.
The bias for the PT_GNU_EH_FRAME was using the paddr instead of vaddr.
This doesn't match the way the load bias is calculated, which always
use vaddr - offset, so change to use vaddr.

Found on an old x86 device that has a vdso that sets vaddr differently
from paddr.

Add a new offline test to catch this case and update the elf interface
unit tests.

Also, fix a small bug in the unwind_for_offline tool.

Bug: 142365899

Test: Unit tests pass.
Change-Id: I5f0bf062dd8ee45aa8553189ba493ec962e0b059
2019-10-21 19:11:22 -07:00
Max Spector
0c9d488374 Liblogd log fuzzer
Basic fuzzer for liblogd LogBuffer::log

Bug: 143107334
Test: Ran the fuzzer
Change-Id: Ifaeef1410655cf57c58b2b78484b832dfea6333a
2019-10-21 18:26:59 -07:00
Alessio Balsini
da79719fce Merge "libsnapshot_test: Fix loading both the static and dynamic libcrypto libs"
am: 92155132e2

Change-Id: I1b72003da2c7fd82a5ce080871c5897cc73aad30
2019-10-21 16:53:08 -07:00
Treehugger Robot
92155132e2 Merge "libsnapshot_test: Fix loading both the static and dynamic libcrypto libs" 2019-10-21 23:22:53 +00:00
Alessio Balsini
3f88b4e63c libsnapshot_test: Fix loading both the static and dynamic libcrypto libs
libsnapshot_test was depending both directly on libcrypto_static and
indirectly through liblp on libcrypto.  This was causing a failure at
runtime on the sanity check when loading the libcrypto library.
Dropped the dependency on libcrypto_static and switched to the dynamic
libcrypto to fix this violation.

Test: libsnapshot_test
Fixes: 143094706
Change-Id: Iba959e234348f7deb81893c9105a13628ce0eb6e
Signed-off-by: Tobias Thierer <tobiast@google.com>
Signed-off-by: Alessio Balsini <balsini@google.com>
2019-10-21 21:31:39 +00:00
Tom Cherry
122ae5806a Merge "liblog: fixup log_id_t"
am: d1a6d75d29

Change-Id: I0e0acb5616f9178c43b084f97f8bb8189575a19c
2019-10-21 13:27:47 -07:00
Tom Cherry
d1a6d75d29 Merge "liblog: fixup log_id_t" 2019-10-21 19:36:12 +00:00
Alessio Balsini
3b5491253f Merge "Fix fuzzer name and sizeof(array)"
am: f5b2927908

Change-Id: I356d5474d304fa28606e53deac5cf9b8c2059711
2019-10-21 11:20:32 -07:00
Treehugger Robot
f5b2927908 Merge "Fix fuzzer name and sizeof(array)" 2019-10-21 17:28:48 +00:00
Alessio Balsini
d0de1114a9 Fix fuzzer name and sizeof(array)
The fuzzer name "dm_table_fuzzer" was too generic. Looking forward to an
extension to host tests where each fuzzer name should be considered a
unique identifier, change the fuzzer name to, "dm_linear_table_fuzzer".

Fix also the syntax of sizeof(array) declaration.

Bug: none
Test: dm_linear_table_fuzzer
Change-Id: Iaa0ee9a0eb1352f0c5269b07198d0a34d8fb3254
Signed-off-by: Alessio Balsini <balsini@google.com>
2019-10-21 11:44:08 +00:00
Tom Cherry
5e81aa2cf5 liblog: fixup log_id_t
1) We don't need two copies of log_id_t
2) We don't need misleading sizeof_log_id_t or typeof_log_id_t macros
3) logd should use android_log_header_t explicitly for its recv buffer
   size
4) Following on from b/129272512, we're settling that returning
   LOG_ID_MAX is an acceptable return value from
   android_name_to_log_id().

Bug: 129272512
Test: build, liblog, logcat unit tests
Change-Id: I67fb964a4a0ae9cb6e1514ca110e47e00dfcfa9a
2019-10-18 09:58:08 -07:00
Maciej Żenczykowski
19177b66cb Merge "better document ifc_{add,del}_address return code"
am: 32e7325c44

Change-Id: I720682a134a47ebd2e76a8d08b30b17cefb4dc8c
2019-10-17 23:31:15 -07:00