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

Commit 2768a7b6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes I51839f56,I821c42c3,I77ac3f77,I91afd69d am: 8b90646c am: 21caa80f am: 2cc6ed18 

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

Change-Id: I4876e082bff8a3aae38ca5ad150cd3027ce2de61
parents 623da181 2cc6ed18

libs/binder/Android.bp

+0 −4
Original line number Original line Diff line number Diff line
@@ -181,11 +181,7 @@ cc_library { 
    ],

    ],

    tidy_checks_as_errors: [

    tidy_checks_as_errors: [

        "*",

        "*",

        "-google-build-using-namespace",

        "-google-default-arguments",

        "-google-explicit-constructor",

        "-google-runtime-int",

        "-google-runtime-int",

        "-performance-unnecessary-value-param",

    ],

    ],

}

}

libs/binder/IMediaResourceMonitor.cpp

+1 −0
Original line number Original line Diff line number Diff line
@@ -42,6 +42,7 @@ IMPLEMENT_META_INTERFACE(MediaResourceMonitor, "android.media.IMediaResourceMoni 




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

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





// NOLINTNEXTLINE(google-default-arguments)

status_t BnMediaResourceMonitor::onTransact( uint32_t code, const Parcel& data, Parcel* reply,

status_t BnMediaResourceMonitor::onTransact( uint32_t code, const Parcel& data, Parcel* reply,

        uint32_t flags) {

        uint32_t flags) {

    switch(code) {

    switch(code) {

libs/binder/IPCThreadState.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -1077,7 +1077,7 @@ status_t IPCThreadState::writeTransactionData(int32_t cmd, uint32_t binderFlags, 




sp<BBinder> the_context_object;

sp<BBinder> the_context_object;





void IPCThreadState::setTheContextObject(sp<BBinder> obj)

void IPCThreadState::setTheContextObject(const sp<BBinder>& obj)

{

{

    the_context_object = obj;

    the_context_object = obj;

}

}

libs/binder/IServiceManager.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -310,7 +310,7 @@ sp<IBinder> ServiceManagerShim::waitForService(const String16& name16) 
    // Simple RAII object to ensure a function call immediately before going out of scope

    // Simple RAII object to ensure a function call immediately before going out of scope

    class Defer {

    class Defer {

    public:

    public:

        Defer(std::function<void()>&& f) : mF(std::move(f)) {}

        explicit Defer(std::function<void()>&& f) : mF(std::move(f)) {}

        ~Defer() { mF(); }

        ~Defer() { mF(); }

    private:

    private:

        std::function<void()> mF;

        std::function<void()> mF;

libs/binder/IUidObserver.cpp

+1 −0
Original line number Original line Diff line number Diff line
@@ -75,6 +75,7 @@ IMPLEMENT_META_INTERFACE(UidObserver, "android.app.IUidObserver"); 




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

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





// NOLINTNEXTLINE(google-default-arguments)

status_t BnUidObserver::onTransact(

status_t BnUidObserver::onTransact(

    uint32_t code, const Parcel& data, Parcel* reply, uint32_t flags)

    uint32_t code, const Parcel& data, Parcel* reply, uint32_t flags)

{

{