drgreen/android_device_google_gs-common
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "comply with VTS requirements"

Browse Source 
Revert submission 22302106-dumpstate aidl

Reason for revert: build failed on udc-d1-dev

Reverted changes: /q/submissionid:22302106-dumpstate+aidl

Change-Id: I4b786f509b80113ca2acf2e1055808c084d1f9bb
This commit is contained in:
Adam Shih 2023-03-29 02:45:20 +00:00 committed by Android (Google) Code Review
parent 5fa9528c83
commit f272a85a53
6 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gear/dumpstate/Dumpstate.cpp
View File

@ -154,11 +154,7 @@ ndk::ScopedAStatus Dumpstate::dumpstateBoard(const std::vector<::ndk::ScopedFile
int64_t in_timeoutMillis) { int64_t in_timeoutMillis) {
// Unused arguments. // Unused arguments.
(void) in_timeoutMillis; (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) { if (in_fds.size() < 1) {
ALOGE("no FDs\n"); ALOGE("no FDs\n");
@ -175,7 +171,6 @@ ndk::ScopedAStatus Dumpstate::dumpstateBoard(const std::vector<::ndk::ScopedFile
if (in_fds.size() < 2) { if (in_fds.size() < 2) {
ALOGE("no FD for dumpstate_board binary\n"); ALOGE("no FD for dumpstate_board binary\n");
dumpTextSection(fd, "");
} else { } else {
int fd_bin = in_fds[1].get(); int fd_bin = in_fds[1].get();
dumpLogSection(fd, fd_bin); dumpLogSection(fd, fd_bin);

1
gear/dumpstate/sepolicy/file.te
View File

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

1
gear/dumpstate/sepolicy/file_contexts
View File

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

2
gear/dumpstate/sepolicy/hal_dumpstate_default.te
View File

@ -1,7 +1,5 @@
# 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 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:dir create_dir_perms;
allow hal_dumpstate_default radio_vendor_data_file:file create_file_perms; allow hal_dumpstate_default radio_vendor_data_file:file create_file_perms;
allow hal_dumpstate_default shell_data_file:file getattr; allow hal_dumpstate_default shell_data_file:file getattr;
set_prop(hal_dumpstate_default, vendor_logger_prop)

3
gear/dumpstate/sepolicy/property.te
View File

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

3
gear/dumpstate/sepolicy/property_contexts
View File

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