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

Commit bba58e92 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 13580881 from 2f4e35ae to 25Q4-release 

Change-Id: Idea9b5117726f01b27d5edae655c83e999613039
parents 3d487387 2f4e35ae

cmds/dumpstate/DumpPool.h

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#ifndef FRAMEWORK_NATIVE_CMD_DUMPPOOL_H_

#define FRAMEWORK_NATIVE_CMD_DUMPPOOL_H_



#include <functional>

#include <future>

#include <queue>

#include <string>

cmds/dumpstate/TaskQueue.h

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#ifndef FRAMEWORK_NATIVE_CMD_TASKQUEUE_H_

#define FRAMEWORK_NATIVE_CMD_TASKQUEUE_H_



#include <functional>

#include <mutex>

#include <queue>

cmds/dumpstate/dumpstate.cpp

+17 −7
Original line number Diff line number Diff line
@@ -2793,7 +2793,7 @@ static void ShowUsage() { 
            "  -s: write zipped file to control socket (for init)\n"

            "  -S: write file location to control socket (for init)\n"

            "  -q: disable vibrate\n"

            "  -P: send broadcast when started and do progress updates\n"

            "  -P: send broadcast when started and finished and do progress updates\n"

            "  -R: take bugreport in remote mode (shouldn't be used with -P)\n"

            "  -w: start binder service and make it wait for a call to startBugreport\n"

            "  -L: output limited information that is safe for submission in feedback reports\n"
@@ -3392,14 +3392,16 @@ Dumpstate::RunStatus Dumpstate::RunInternal(int32_t calling_uid, 
        return ERROR;

    }



    // Interactive, wear & telephony modes are default to true.

    // and may enable from cli option or when using control socket

    if (options_->do_progress_updates) {



    // clang-format off

    std::vector<std::string> am_args = {

            "--receiver-permission", "android.permission.DUMP",

    };

    // clang-format on



    // Interactive, wear & telephony modes are default to true.

    // and may enable from cli option or when using control socket

    if (options_->do_progress_updates) {

        // Send STARTED broadcast for apps that listen to bugreport generation events

        SendBroadcast("com.android.internal.intent.action.BUGREPORT_STARTED",

                      am_args, multiuser_get_user_id(calling_uid));
@@ -3554,6 +3556,14 @@ Dumpstate::RunStatus Dumpstate::RunInternal(int32_t calling_uid, 
        }

    }



     if (options_->do_progress_updates) {

        // Send COMPLETED broadcast to notify corresponding apps.

        // Compare to the deprecated `BUGREPORT_FINISHED` action, this does not contain any

        // bugreport information. This acts solely for notification only.

        SendBroadcast("com.android.internal.intent.action.BUGREPORT_COMPLETED",

                      am_args, multiuser_get_user_id(calling_uid));

     }



    /* vibrate a few but shortly times to let user know it's finished */

    if (options_->do_vibrate) {

        for (int i = 0; i < 3; i++) {
@@ -4716,7 +4726,7 @@ void Dumpstate::UpdateProgress(int32_t delta_sec) { 
    // Always update progess so stats can be tuned...

    progress_->Inc(delta_sec);



    // ...but only notifiy listeners when necessary.

    // ...but only notify listeners when necessary.

    if (!options_->do_progress_updates) return;



    int progress = progress_->Get();

cmds/idlcli/utils.h

+2 −0
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ 


#include <android/binder_enums.h>



#include <algorithm>

#include <functional>

#include <iomanip>

#include <iostream>

#include <map>

cmds/installd/CacheTracker.cpp

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ 
#include <sys/xattr.h>

#include <utils/Trace.h>



#include <algorithm>



#include <android-base/logging.h>

#include <android-base/stringprintf.h>