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

Merge "Revert "comply with VTS requirements"" into udc-dev am: cb902f0581

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

Change-Id: I697f5333ba05999cee87e30b71bb9f5f81593c86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
RD Babiera 2023-03-27 22:31:37 +00:00 committed by Automerger Merge Worker
commit 833ae34288
4 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gear/dumpstate/Dumpstate.cpp
View File

@ -154,10 +154,8 @@ 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;
if (in_mode < IDumpstateDevice::DumpstateMode::FULL || in_mode > IDumpstateDevice::DumpstateMode::PROTO) { (void) in_mode;
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");
return ndk::ScopedAStatus::fromExceptionCodeWithMessage(EX_ILLEGAL_ARGUMENT, return ndk::ScopedAStatus::fromExceptionCodeWithMessage(EX_ILLEGAL_ARGUMENT,
@ -173,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/hal_dumpstate_default.te
View File

@ -2,5 +2,4 @@ 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)

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

@ -1,2 +0,0 @@
vendor_internal_prop(vendor_logger_prop)

2
gear/dumpstate/sepolicy/property_contexts
View File

@ -1,2 +0,0 @@
persist.vendor.verbose_logging_enabled u:object_r:vendor_logger_prop:s0