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

Commit 18fc0120 authored by Mathias Agopian's avatar Mathias Agopian Committed by Android Git Automerger
Browse files

am a2de8e31: Merge change Ie05f07df into eclair 

Merge commit 'a2de8e31' into eclair-mr2

* commit 'a2de8e31':
  fix [2170319] gmail bulk operation checkbox latency on passion
parents c38f6f33 a2de8e31

include/private/ui/SharedBufferStack.h

+1 −0
Original line number Diff line number Diff line
@@ -289,6 +289,7 @@ public: 
    void setStatus(status_t status);

    status_t reallocate();

    status_t assertReallocate(int buffer);

    int32_t getQueuedCount() const;

    

    Region getDirtyRegion(int buffer) const;

include/private/ui/SurfaceFlingerSynchro.h

deleted100644 → 0
+0 −48
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2008 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */





#ifndef ANDROID_SURFACE_FLINGER_SYNCHRO_H

#define ANDROID_SURFACE_FLINGER_SYNCHRO_H



#include <stdint.h>

#include <sys/types.h>

#include <utils/Errors.h>

#include <ui/ISurfaceComposer.h>



namespace android {



class SurfaceFlinger;



class SurfaceFlingerSynchro

{

public:

                // client constructor

                SurfaceFlingerSynchro(const sp<ISurfaceComposer>& flinger);

                ~SurfaceFlingerSynchro();

    

                // signal surfaceflinger for some work

    status_t    signal();

    

private:

    friend class SurfaceFlinger;

    sp<ISurfaceComposer> mSurfaceComposer;

};



}; // namespace android



#endif // ANDROID_SURFACE_FLINGER_SYNCHRO_H

include/ui/SurfaceComposerClient.h

+1 −1
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ private: 
                SharedClient*               mControl;

                sp<IMemoryHeap>             mControlMemory;

                sp<ISurfaceFlingerClient>   mClient;

                SurfaceFlingerSynchro*      mSignalServer;

                sp<ISurfaceComposer>        mSignalServer;

};



}; // namespace android

libs/surfaceflinger/Layer.cpp

+4 −2
Original line number Diff line number Diff line
@@ -460,8 +460,10 @@ void Layer::lockPageFlip(bool& recomputeVisibleRegions) 
        }

    }



    // FIXME: signal an event if we have more buffers waiting

    // mFlinger->signalEvent();

    if (lcblk->getQueuedCount()) {

        // signal an event if we have more buffers waiting

        mFlinger->signalEvent();

    }



    if (!mPostedDirtyRegion.isEmpty()) {

        reloadTexture( mPostedDirtyRegion );

libs/ui/Android.mk

+1 −2
Original line number Diff line number Diff line
@@ -27,8 +27,7 @@ LOCAL_SRC_FILES:= \ 
	Region.cpp \

	SharedBufferStack.cpp \

	Surface.cpp \

	SurfaceComposerClient.cpp \

	SurfaceFlingerSynchro.cpp 

	SurfaceComposerClient.cpp



LOCAL_SHARED_LIBRARIES := \

	libcutils \