commit cb902f05819cc2ac0843769a5da16c1687be6441
author RD Babiera <rdbabiera@google.com> Mon Mar 27 21:52:39 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 27 21:52:39 2023 +0000
tree 030047fbf222fef774a05c4ef1a74c4cc4b00552
parent 041b98083597e6ee68cde8e19bbaee119040769f
parent 8620418abacfe7a167f0d8bb3203ff0727253317

Merge "Revert "comply with VTS requirements"" into udc-dev

gear/dumpstate/Dumpstate.cpp

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 @@
                                              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 @@
 
     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);

gear/dumpstate/sepolicy/hal_dumpstate_default.te

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 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)
 

gear/dumpstate/sepolicy/property.te

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)
-

gear/dumpstate/sepolicy/property_contexts

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
-