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

Commit 1d6d0d8d authored by Paul Chang's avatar Paul Chang Committed by Automerger Merge Worker
Browse files

Remove unnecessary code for new BugreportManager am: 5702b485 am: 9d81b643 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1507763

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If4d55c73fd1bbe1337d9d1471ac2e820c6d812ec
parents a3ee5ad5 9d81b643

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

+1 −1
Original line number Diff line number Diff line
@@ -72,5 +72,5 @@ interface IDumpstateListener { 
    /**

     * Called when ui intensive bugreport dumps are finished.

     */

    oneway void onUiIntensiveBugreportDumpsFinished(String callingPackage);

    oneway void onUiIntensiveBugreportDumpsFinished();

}

cmds/dumpstate/dumpstate.cpp

+6 −8
Original line number Diff line number Diff line
@@ -2866,17 +2866,17 @@ Dumpstate::RunStatus Dumpstate::RunInternal(int32_t calling_uid, 
    // TODO(b/158737089) reduce code repetition in if branches

    if (options_->telephony_only) {

        MaybeTakeEarlyScreenshot();

        onUiIntensiveBugreportDumpsFinished(calling_uid, calling_package);

        onUiIntensiveBugreportDumpsFinished(calling_uid);

        MaybeCheckUserConsent(calling_uid, calling_package);

        DumpstateTelephonyOnly(calling_package);

    } else if (options_->wifi_only) {

        MaybeTakeEarlyScreenshot();

        onUiIntensiveBugreportDumpsFinished(calling_uid, calling_package);

        onUiIntensiveBugreportDumpsFinished(calling_uid);

        MaybeCheckUserConsent(calling_uid, calling_package);

        DumpstateWifiOnly();

    } else if (options_->limited_only) {

        MaybeTakeEarlyScreenshot();

        onUiIntensiveBugreportDumpsFinished(calling_uid, calling_package);

        onUiIntensiveBugreportDumpsFinished(calling_uid);

        MaybeCheckUserConsent(calling_uid, calling_package);

        DumpstateLimitedOnly();

    } else {
@@ -2885,7 +2885,7 @@ Dumpstate::RunStatus Dumpstate::RunInternal(int32_t calling_uid, 


        // Take screenshot and get consent only after critical dumpsys has finished.

        MaybeTakeEarlyScreenshot();

        onUiIntensiveBugreportDumpsFinished(calling_uid, calling_package);

        onUiIntensiveBugreportDumpsFinished(calling_uid);

        MaybeCheckUserConsent(calling_uid, calling_package);



        // Dump state for the default case. This also drops root.
@@ -2969,16 +2969,14 @@ void Dumpstate::MaybeTakeEarlyScreenshot() { 
    TakeScreenshot();

}



void Dumpstate::onUiIntensiveBugreportDumpsFinished(int32_t calling_uid,

                                                    const std::string& calling_package) {

void Dumpstate::onUiIntensiveBugreportDumpsFinished(int32_t calling_uid) {

    if (calling_uid == AID_SHELL || !CalledByApi()) {

        return;

    }

    if (listener_ != nullptr) {

        // Let listener know ui intensive bugreport dumps are finished, then it can do event

        // handling if required.

        android::String16 package(calling_package.c_str());

        listener_->onUiIntensiveBugreportDumpsFinished(package);

        listener_->onUiIntensiveBugreportDumpsFinished();

    }

}

cmds/dumpstate/dumpstate.h

+1 −2
Original line number Diff line number Diff line
@@ -544,8 +544,7 @@ class Dumpstate { 


    void MaybeTakeEarlyScreenshot();



    void onUiIntensiveBugreportDumpsFinished(int32_t calling_uid,

                                             const std::string& calling_package);

    void onUiIntensiveBugreportDumpsFinished(int32_t calling_uid);



    void MaybeCheckUserConsent(int32_t calling_uid, const std::string& calling_package);

cmds/dumpstate/tests/dumpstate_smoke_test.cpp

+2 −5
Original line number Diff line number Diff line
@@ -173,12 +173,9 @@ class DumpstateListener : public BnDumpstateListener { 
        return binder::Status::ok();

    }



    binder::Status onUiIntensiveBugreportDumpsFinished(const android::String16& callingpackage)

        override {

    binder::Status onUiIntensiveBugreportDumpsFinished() override {

        std::lock_guard <std::mutex> lock(lock_);

        std::string callingpackageUtf8 = std::string(String8(callingpackage).string());

        dprintf(out_fd_, "\rCalling package of ui intensive bugreport dumps finished: %s",

                callingpackageUtf8.c_str());

        dprintf(out_fd_, "\rUi intensive bugreport dumps finished");

        return binder::Status::ok();

    }

cmds/dumpstate/tests/dumpstate_test.cpp

+1 −2
Original line number Diff line number Diff line
@@ -70,8 +70,7 @@ class DumpstateListenerMock : public IDumpstateListener { 
    MOCK_METHOD1(onError, binder::Status(int32_t error_code));

    MOCK_METHOD0(onFinished, binder::Status());

    MOCK_METHOD1(onScreenshotTaken, binder::Status(bool success));

    MOCK_METHOD1(onUiIntensiveBugreportDumpsFinished,

        binder::Status(const android::String16& callingpackage));

    MOCK_METHOD0(onUiIntensiveBugreportDumpsFinished, binder::Status());



  protected:

    MOCK_METHOD0(onAsBinder, IBinder*());