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

Commit c6c5cdde authored by Nandana Dutt's avatar Nandana Dutt Committed by android-build-merger
Browse files

Merge "Rename IDumpstateListener errorcode" am: d7d075fb 

am: c943242f

Change-Id: I2a8b3bf992243d3d5508248127e690e050f925e3
parents 66cc69fe c943242f

cmds/dumpstate/DumpstateService.cpp

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ binder::Status DumpstateService::startBugreport(int32_t calling_uid, 
    if (ds_ != nullptr) {

        MYLOGE("Error! There is already a bugreport in progress. Returning.");

        if (listener != nullptr) {

            listener->onError(IDumpstateListener::BUGREPORT_ERROR_CONCURRENT_BUGREPORTS_FORBIDDEN);

            listener->onError(IDumpstateListener::BUGREPORT_ERROR_ANOTHER_REPORT_IN_PROGRESS);

        }

        return exception(binder::Status::EX_SERVICE_SPECIFIC,

                         "There is already a bugreport in progress");

cmds/dumpstate/binder/android/os/IDumpstateListener.aidl

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ interface IDumpstateListener { 
    const int BUGREPORT_ERROR_USER_CONSENT_TIMED_OUT = 4;



    /* There is currently a bugreport running. The caller should try again later. */

    const int BUGREPORT_ERROR_CONCURRENT_BUGREPORTS_FORBIDDEN = 5;

    const int BUGREPORT_ERROR_ANOTHER_REPORT_IN_PROGRESS = 5;



    /**

     * Called on an error condition with one of the error codes listed above.

cmds/dumpstate/tests/dumpstate_smoke_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -475,7 +475,7 @@ TEST_F(DumpstateBinderTest, SimultaneousBugreportsNotAllowed) { 
    EXPECT_FALSE(status.isOk());

    WaitTillExecutionComplete(listener2.get());

    EXPECT_EQ(listener2->getErrorCode(),

              IDumpstateListener::BUGREPORT_ERROR_CONCURRENT_BUGREPORTS_FORBIDDEN);

              IDumpstateListener::BUGREPORT_ERROR_ANOTHER_REPORT_IN_PROGRESS);



    // Meanwhile the first call works as expected. Service should not die in this case.

    WaitTillExecutionComplete(listener1.get());