From 8620418abacfe7a167f0d8bb3203ff0727253317 Mon Sep 17 00:00:00 2001 From: RD Babiera Date: Mon, 27 Mar 2023 20:58:33 +0000 Subject: [PATCH] Revert "comply with VTS requirements" Revert submission 22242215-dumpstate aidl Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=git_udc-d1-dev&target=aosp_husky-userdebug&lkgb=9826121&lkbb=9829863&fkbb=9826130, bug b/275279368. Reverted changes: /q/submissionid:22242215-dumpstate+aidl Change-Id: I856e29ad3236014c9db41e43ee19bf8ec43979a8 --- gear/dumpstate/Dumpstate.cpp | 7 ++----- gear/dumpstate/sepolicy/hal_dumpstate_default.te | 1 - gear/dumpstate/sepolicy/property.te | 2 -- gear/dumpstate/sepolicy/property_contexts | 2 -- 4 files changed, 2 insertions(+), 10 deletions(-) delete mode 100644 gear/dumpstate/sepolicy/property.te delete mode 100644 gear/dumpstate/sepolicy/property_contexts diff --git a/gear/dumpstate/Dumpstate.cpp b/gear/dumpstate/Dumpstate.cpp index 842e67d..1e4d982 100644 --- a/gear/dumpstate/Dumpstate.cpp +++ b/gear/dumpstate/Dumpstate.cpp @@ -154,10 +154,8 @@ ndk::ScopedAStatus Dumpstate::dumpstateBoard(const std::vector<::ndk::ScopedFile int64_t in_timeoutMillis) { // Unused arguments. (void) in_timeoutMillis; - 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"); - } + (void) in_mode; + if (in_fds.size() < 1) { ALOGE("no FDs\n"); 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) { ALOGE("no FD for dumpstate_board binary\n"); - dumpTextSection(fd, ""); } else { int fd_bin = in_fds[1].get(); dumpLogSection(fd, fd_bin); diff --git a/gear/dumpstate/sepolicy/hal_dumpstate_default.te b/gear/dumpstate/sepolicy/hal_dumpstate_default.te index 96ff573..3e4db45 100644 --- a/gear/dumpstate/sepolicy/hal_dumpstate_default.te +++ b/gear/dumpstate/sepolicy/hal_dumpstate_default.te @@ -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:file create_file_perms; allow hal_dumpstate_default shell_data_file:file getattr; -set_prop(hal_dumpstate_default, vendor_logger_prop) diff --git a/gear/dumpstate/sepolicy/property.te b/gear/dumpstate/sepolicy/property.te deleted file mode 100644 index 6a65855..0000000 --- a/gear/dumpstate/sepolicy/property.te +++ /dev/null @@ -1,2 +0,0 @@ -vendor_internal_prop(vendor_logger_prop) - diff --git a/gear/dumpstate/sepolicy/property_contexts b/gear/dumpstate/sepolicy/property_contexts deleted file mode 100644 index e6b1f76..0000000 --- a/gear/dumpstate/sepolicy/property_contexts +++ /dev/null @@ -1,2 +0,0 @@ -persist.vendor.verbose_logging_enabled u:object_r:vendor_logger_prop:s0 -