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

Commit f2879207 authored by Gavin Corkery's avatar Gavin Corkery Committed by Automerger Merge Worker
Browse files

Merge changes from topic "remove-duplicate-br-calls" am: 9b795b5f

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iebb4d1a9682e7ae6bdb3e491f9e1020b8ce66edf
parents 9d81b643 9b795b5f
Loading
Loading
Loading
Loading
+10 −18
Original line number Original line Diff line number Diff line
@@ -2863,31 +2863,23 @@ Dumpstate::RunStatus Dumpstate::RunInternal(int32_t calling_uid,
    // duration is logged into MYLOG instead.
    // duration is logged into MYLOG instead.
    PrintHeader();
    PrintHeader();


    // TODO(b/158737089) reduce code repetition in if branches
    bool is_dumpstate_restricted = options_->telephony_only
    if (options_->telephony_only) {
                                   || options_->wifi_only
                                   || options_->limited_only;
    if (!is_dumpstate_restricted) {
        // Invoke critical dumpsys first to preserve system state, before doing anything else.
        RunDumpsysCritical();
    }
    MaybeTakeEarlyScreenshot();
    MaybeTakeEarlyScreenshot();
    onUiIntensiveBugreportDumpsFinished(calling_uid);
    onUiIntensiveBugreportDumpsFinished(calling_uid);
    MaybeCheckUserConsent(calling_uid, calling_package);
    MaybeCheckUserConsent(calling_uid, calling_package);
    if (options_->telephony_only) {
        DumpstateTelephonyOnly(calling_package);
        DumpstateTelephonyOnly(calling_package);
    } else if (options_->wifi_only) {
    } else if (options_->wifi_only) {
        MaybeTakeEarlyScreenshot();
        onUiIntensiveBugreportDumpsFinished(calling_uid);
        MaybeCheckUserConsent(calling_uid, calling_package);
        DumpstateWifiOnly();
        DumpstateWifiOnly();
    } else if (options_->limited_only) {
    } else if (options_->limited_only) {
        MaybeTakeEarlyScreenshot();
        onUiIntensiveBugreportDumpsFinished(calling_uid);
        MaybeCheckUserConsent(calling_uid, calling_package);
        DumpstateLimitedOnly();
        DumpstateLimitedOnly();
    } else {
    } else {
        // Invoke critical dumpsys first to preserve system state, before doing anything else.
        RunDumpsysCritical();

        // Take screenshot and get consent only after critical dumpsys has finished.
        MaybeTakeEarlyScreenshot();
        onUiIntensiveBugreportDumpsFinished(calling_uid);
        MaybeCheckUserConsent(calling_uid, calling_package);

        // Dump state for the default case. This also drops root.
        // Dump state for the default case. This also drops root.
        RunStatus s = DumpstateDefaultAfterCritical();
        RunStatus s = DumpstateDefaultAfterCritical();
        if (s != RunStatus::OK) {
        if (s != RunStatus::OK) {