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

Commit 41eb78d6 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 7194171 from cf69b996 to sc-release 

Change-Id: I8d3857686aefc375f2c91690db91f992ea8176e4
parents 1571f881 cf69b996

cmds/dumpstate/dumpstate.cpp

+3 −1
Original line number Diff line number Diff line
@@ -2414,7 +2414,9 @@ static void SendBroadcast(const std::string& action, const std::vector<std::stri 


static void Vibrate(int duration_ms) {

    // clang-format off

    RunCommand("", {"cmd", "vibrator", "vibrate", "-f", std::to_string(duration_ms), "dumpstate"},

    std::vector<std::string> args = {"cmd", "vibrator_manager", "synced", "-f", "-d", "dumpstate",

                                     "oneshot", std::to_string(duration_ms)};

    RunCommand("", args,

               CommandOptions::WithTimeout(10)

                   .Log("Vibrate: '%s'\n")

                   .Always()

libs/binder/BufferedTextOutput.cpp

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
 */



#include "BufferedTextOutput.h"

#include <binder/Debug.h>



#include <cutils/atomic.h>

#include <utils/Log.h>
@@ -26,6 +25,7 @@ 
#include <stdio.h>

#include <stdlib.h>



#include "Debug.h"

#include "Static.h"



// ---------------------------------------------------------------------------

libs/binder/Debug.cpp

+2 −1
Original line number Diff line number Diff line
@@ -14,7 +14,8 @@ 
 * limitations under the License.

 */



#include <binder/Debug.h>

#include "Debug.h"



#include <binder/ProcessState.h>



#include <utils/misc.h>

libs/binder/TextOutput.cpp

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


#include <binder/TextOutput.h>



#include <binder/Debug.h>

#include "Debug.h"



#include <utils/String8.h>

#include <utils/String16.h>