comply with VTS requirements am: 5fa9528c83

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/22302106

Change-Id: I9a60dfdbbf87e87a64cd37d73e278247a3254b4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Adam Shih 2023-03-29 00:47:12 +00:00 committed by Automerger Merge Worker
commit c7f34bd456
6 changed files with 16 additions and 1 deletions

View File

@ -154,7 +154,11 @@ ndk::ScopedAStatus Dumpstate::dumpstateBoard(const std::vector<::ndk::ScopedFile
int64_t in_timeoutMillis) {
// Unused arguments.
(void) in_timeoutMillis;
(void) in_mode;
if (in_mode < IDumpstateDevice::DumpstateMode::FULL || in_mode > IDumpstateDevice::DumpstateMode::PROTO) {
ALOGE("Invalid mode: %d\n", in_mode);
return ndk::ScopedAStatus::fromExceptionCodeWithMessage(EX_ILLEGAL_ARGUMENT, "Invalid mode");
}
if (in_fds.size() < 1) {
ALOGE("no FDs\n");
@ -171,6 +175,7 @@ ndk::ScopedAStatus Dumpstate::dumpstateBoard(const std::vector<::ndk::ScopedFile
if (in_fds.size() < 2) {
ALOGE("no FD for dumpstate_board binary\n");
dumpTextSection(fd, "");
} else {
int fd_bin = in_fds[1].get();
dumpLogSection(fd, fd_bin);

View File

@ -1,3 +1,4 @@
# dumpstate packing directory
type radio_vendor_data_file, file_type, data_file_type;
userdebug_or_eng(`
typeattribute radio_vendor_data_file mlstrustedobject;

View File

@ -1,3 +1,4 @@
# generic dumpstate for pixel
/vendor/bin/hw/android\.hardware\.dumpstate-service u:object_r:hal_dumpstate_default_exec:s0
/data/vendor/radio(/.*)? u:object_r:radio_vendor_data_file:s0

View File

@ -1,5 +1,7 @@
# required permission to use tar to pack dumpsate_board.bin
allow hal_dumpstate_default vendor_toolbox_exec:file execute_no_trans;
allow hal_dumpstate_default radio_vendor_data_file:dir create_dir_perms;
allow hal_dumpstate_default radio_vendor_data_file:file create_file_perms;
allow hal_dumpstate_default shell_data_file:file getattr;
set_prop(hal_dumpstate_default, vendor_logger_prop)

View File

@ -0,0 +1,3 @@
# verbose property
vendor_internal_prop(vendor_logger_prop)

View File

@ -0,0 +1,3 @@
# verbose property name
persist.vendor.verbose_logging_enabled u:object_r:vendor_logger_prop:s0