Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e85a11b6 authored by Abhijeet Kaur's avatar Abhijeet Kaur Committed by Android (Google) Code Review
Browse files

Merge "Remove outfile flag as it's unused and all callers migrated"

parents e763ab98 07d587b9

cmds/dumpstate/dumpstate.cpp

+0 −3
Original line number Diff line number Diff line
@@ -2328,9 +2328,6 @@ Dumpstate::RunStatus Dumpstate::DumpOptions::Initialize(int argc, char* argv[]) 
            // clang-format off

            case 'd': do_add_date = true;            break;

            case 'z': do_zip_file = true;            break;

            // o=use_outfile not supported anymore.

            // TODO(b/111441001): Remove when all callers have migrated.

            case 'o': break;

            case 's': use_socket = true;             break;

            case 'S': use_control_socket = true;     break;

            case 'v': show_header_only = true;       break;

cmds/dumpstate/dumpstate.rc

+1 −2
Original line number Diff line number Diff line
@@ -11,8 +11,7 @@ service dumpstate /system/bin/dumpstate -s 


# dumpstatez generates a zipped bugreport but also uses a socket to print the file location once

# it is finished.

service dumpstatez /system/bin/dumpstate -S -d -z \

        -o /data/user_de/0/com.android.shell/files/bugreports/bugreport

service dumpstatez /system/bin/dumpstate -S -d -z

    socket dumpstate stream 0660 shell log

    class main

    disabled

cmds/dumpstate/tests/dumpstate_smoke_test.cpp

+1 −3
Original line number Diff line number Diff line
@@ -201,9 +201,7 @@ class ZippedBugreportGenerationTest : public Test { 
            (char*)"dumpstate",

            (char*)"-d",

            (char*)"-z",

            (char*)"-B",

            (char*)"-o",

            (char*)dirname(android::base::GetExecutablePath().c_str())

            (char*)"-B"

        };

        // clang-format on

        sp<DumpstateListener> listener(new DumpstateListener(dup(fileno(stdout)), sections));