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

Commit 753e3c84 authored by Ricardo Cerqueira's avatar Ricardo Cerqueira
Browse files

Merge commit '4.4.1_r1' into HEAD

parents 2b38f723 2c4c3354

include/binder/Parcel.h

+1 −0
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ public: 
    status_t            writeString16(const char16_t* str, size_t len);

    status_t            writeStrongBinder(const sp<IBinder>& val);

    status_t            writeWeakBinder(const wp<IBinder>& val);

    status_t            writeInt32Array(size_t len, const int32_t *val);



    template<typename T>

    status_t            write(const Flattenable<T>& val);

include/powermanager/IPowerManager.h

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ public: 
    virtual status_t acquireWakeLockWithUid(int flags, const sp<IBinder>& lock, const String16& tag,

            const String16& packageName, int uid) = 0;

    virtual status_t releaseWakeLock(const sp<IBinder>& lock, int flags) = 0;

    virtual status_t updateWakeLockUids(const sp<IBinder>& lock, int len, const int *uids) = 0;

};



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

libs/binder/Parcel.cpp

+10 −0
Original line number Diff line number Diff line
@@ -617,6 +617,16 @@ status_t Parcel::writeInt32(int32_t val) 
{

    return writeAligned(val);

}

status_t Parcel::writeInt32Array(size_t len, const int32_t *val) {

    if (!val) {

        return writeAligned(-1);

    }

    status_t ret = writeAligned(len);

    if (ret == NO_ERROR) {

        ret = write(val, len * sizeof(*val));

    }

    return ret;

}



status_t Parcel::writeInt64(int64_t val)

{

libs/input/InputTransport.cpp

+6 −3
Original line number Diff line number Diff line
@@ -511,14 +511,17 @@ status_t InputConsumer::consumeBatch(InputEventFactoryInterface* factory, 
    status_t result;

    for (size_t i = mBatches.size(); i-- > 0; ) {

        Batch& batch = mBatches.editItemAt(i);

        if (frameTime < 0 || !mResampleTouch) {

        if (frameTime < 0) {

            result = consumeSamples(factory, batch, batch.samples.size(),

                    outSeq, outEvent);

            mBatches.removeAt(i);

            return result;

        }



        nsecs_t sampleTime = frameTime - RESAMPLE_LATENCY;

        nsecs_t sampleTime = frameTime;

        if (mResampleTouch) {

            sampleTime -= RESAMPLE_LATENCY;

        }

        ssize_t split = findSampleNoLaterThan(batch, sampleTime);

        if (split < 0) {

            continue;
@@ -532,7 +535,7 @@ status_t InputConsumer::consumeBatch(InputEventFactoryInterface* factory, 
        } else {

            next = &batch.samples.itemAt(0);

        }

        if (!result) {

        if (!result && mResampleTouch) {

            resampleTouchState(sampleTime, static_cast<MotionEvent*>(*outEvent), next);

        }

        return result;

opengl/libs/EGL/trace.cpp

+1 −1
Original line number Diff line number Diff line
@@ -435,7 +435,7 @@ EGLAPI gl_hooks_t gHooksSystrace = { 
    if (error) {                                                          \

        CallStack s;                                                      \

        s.update();                                                       \

        s.dump("glGetError:" #_api);                                      \

        s.log("glGetError:" #_api);                                       \

    }                                                                     \



#define TRACE_GL_VOID(_api, _args, _argList, ...)                         \