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

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

Snap for 8317698 from 0af0bba3 to tm-release 

Change-Id: Ia6ab5e622bbfe83b5484990a2fbddc7a3c727f91
parents 0c6a91bc 0af0bba3

cmds/atrace/atrace.cpp

+4 −7
Original line number Diff line number Diff line
@@ -1225,10 +1225,7 @@ int main(int argc, char **argv) 


        if (ret < 0) {

            for (int i = optind; i < argc; i++) {

                if (!setCategoryEnable(argv[i])) {

                    fprintf(stderr, "error enabling tracing category \"%s\"\n", argv[i]);

                    exit(1);

                }

                setCategoryEnable(argv[i]);

            }

            break;

        }
@@ -1344,10 +1341,10 @@ int main(int argc, char **argv) 
        // contain entries from only one CPU can cause "begin" entries without a

        // matching "end" entry to show up if a task gets migrated from one CPU to

        // another.

        if (!onlyUserspace)

        if (!onlyUserspace) {

            ok = clearTrace();



            writeClockSyncMarker();

        }

        if (ok && !async && !traceStream) {

            // Sleep to allow the trace to be captured.

            struct timespec timeLeft;

libs/binder/BufferedTextOutput.h

+1 −1
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ 
#define ANDROID_BUFFEREDTEXTOUTPUT_H



#include <binder/TextOutput.h>

#include <utils/threads.h>

#include <sys/uio.h>

#include <utils/Mutex.h>



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

namespace android {

libs/binder/IMemory.cpp

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
#include <binder/Parcel.h>

#include <log/log.h>



#include <utils/threads.h>

#include <utils/Mutex.h>



#include <map>

libs/binder/IPCThreadState.cpp

+0 −1
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 
#include <utils/CallStack.h>

#include <utils/Log.h>

#include <utils/SystemClock.h>

#include <utils/threads.h>



#include <atomic>

#include <errno.h>

libs/binder/MemoryDealer.cpp

+0 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
#include <utils/Log.h>

#include <utils/SortedVector.h>

#include <utils/String8.h>

#include <utils/threads.h>



#include <stdint.h>

#include <stdio.h>