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

Commit 22f140d6 authored by Xin Li's avatar Xin Li
Browse files

resolve merge conflicts of f11e2bd0 to pi-dev-plus-aosp 

Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: I4966411ed2eb3f4e29726a29069c1cd66a4becff
parents d938b65f f11e2bd0

libs/binder/AppOpsManager.cpp

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ int32_t AppOpsManager::noteOp(int32_t op, int32_t uid, const String16& callingPa 
int32_t AppOpsManager::startOpNoThrow(int32_t op, int32_t uid, const String16& callingPackage,

        bool startIfModeDefault) {

    sp<IAppOpsService> service = getService();

    return service != NULL

    return service != nullptr

            ? service->startOperation(getToken(service), op, uid, callingPackage,

                    startIfModeDefault) : APP_OPS_MANAGER_UNAVAILABLE_MODE;

}

libs/binder/BpBinder.cpp

+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ BpBinder::BpBinder(int32_t handle, int32_t trackedUid) 
    : mHandle(handle)

    , mAlive(1)

    , mObitsSent(0)

    , mObituaries(NULL)

    , mObituaries(nullptr)

    , mTrackedUid(trackedUid)

{

    ALOGV("Creating BpBinder %p handle %d\n", this, mHandle);

libs/binder/IServiceManager.cpp

+2 −2
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ public: 
    virtual sp<IBinder> getService(const String16& name) const

    {

        sp<IBinder> svc = checkService(name);

        if (svc != NULL) return svc;

        if (svc != nullptr) return svc;



        const bool isVendorService =

            strcmp(ProcessState::self()->getDriverName().c_str(), "/dev/vndbinder") == 0;
@@ -172,7 +172,7 @@ public: 
            if (svc != NULL) return svc;

        }

        ALOGW("Service %s didn't start. Returning NULL", String8(name).string());

        return NULL;

        return nullptr;

    }



    virtual sp<IBinder> checkService( const String16& name) const

libs/binder/IShellCallback.cpp

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ status_t BnShellCallback::onTransact( 
            String16 seLinuxContext(data.readString16());

            String16 mode(data.readString16());

            int fd = openFile(path, seLinuxContext, mode);

            if (reply != NULL) {

            if (reply != nullptr) {

                reply->writeNoException();

                if (fd >= 0) {

                    reply->writeInt32(1);

libs/binder/Parcel.cpp

+2 −2
Original line number Diff line number Diff line
@@ -1278,7 +1278,7 @@ status_t Parcel::write(const FlattenableHelperInterface& val) 


    // payload

    void* const buf = this->writeInplace(len);

    if (buf == NULL)

    if (buf == nullptr)

        return BAD_VALUE;



    int* fds = NULL;
@@ -1566,7 +1566,7 @@ const void* Parcel::readInplace(size_t len) const 
                // Still increment the data position by the expected length

                mDataPos += pad_size(len);

                ALOGV("readInplace Setting data pos of %p to %zu", this, mDataPos);

                return NULL;

                return nullptr;

            }

        }