ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'cm-13.0' of https://github.com/LineageOS/android_frameworks_native into replicant-6.0

Browse Source
This commit is contained in:
Wolfgang Wiedmeyer 2017-05-02 19:24:17 +02:00
commit b7def61d92
4 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libs/binder/Parcel.cpp
View File

@ -553,7 +553,7 @@ status_t Parcel::appendFrom(const Parcel *parcel, size_t offset, size_t len)
// grow objects // grow objects
if (mObjectsCapacity < mObjectsSize + numObjects) { if (mObjectsCapacity < mObjectsSize + numObjects) {
size_t newSize = ((mObjectsSize + numObjects)*3)/2; size_t newSize = ((mObjectsSize + numObjects)*3)/2;
if (newSize < mObjectsSize) return NO_MEMORY; // overflow if (newSize*sizeof(binder_size_t) < mObjectsSize) return NO_MEMORY; // overflow
binder_size_t *objects = binder_size_t *objects =
(binder_size_t*)realloc(mObjects, newSize*sizeof(binder_size_t)); (binder_size_t*)realloc(mObjects, newSize*sizeof(binder_size_t));
if (objects == (binder_size_t*)0) { if (objects == (binder_size_t*)0) {
@ -1113,7 +1113,7 @@ restart_write:
} }
if (!enoughObjects) { if (!enoughObjects) {
size_t newSize = ((mObjectsSize+2)*3)/2; size_t newSize = ((mObjectsSize+2)*3)/2;
if (newSize < mObjectsSize) return NO_MEMORY; // overflow if (newSize*sizeof(binder_size_t) < mObjectsSize) return NO_MEMORY; // overflow
binder_size_t* objects = (binder_size_t*)realloc(mObjects, newSize*sizeof(binder_size_t)); binder_size_t* objects = (binder_size_t*)realloc(mObjects, newSize*sizeof(binder_size_t));
if (objects == NULL) return NO_MEMORY; if (objects == NULL) return NO_MEMORY;
mObjects = objects; mObjects = objects;

1
libs/gui/BufferQueueProducer.cpp
View File

@ -1091,6 +1091,7 @@ status_t BufferQueueProducer::setGenerationNumber(uint32_t generationNumber) {
String8 BufferQueueProducer::getConsumerName() const { String8 BufferQueueProducer::getConsumerName() const {
ATRACE_CALL(); ATRACE_CALL();
Mutex::Autolock lock(mCore->mMutex);
BQ_LOGV("getConsumerName: %s", mConsumerName.string()); BQ_LOGV("getConsumerName: %s", mConsumerName.string());
return mConsumerName; return mConsumerName;
} }

3
opengl/libs/Android.mk
View File

@ -47,9 +47,6 @@ LOCAL_CFLAGS += -DEGL_TRACE=1
ifeq ($(BOARD_ALLOW_EGL_HIBERNATION),true) ifeq ($(BOARD_ALLOW_EGL_HIBERNATION),true)
LOCAL_CFLAGS += -DBOARD_ALLOW_EGL_HIBERNATION LOCAL_CFLAGS += -DBOARD_ALLOW_EGL_HIBERNATION
endif endif
ifeq ($(TARGET_BOARD_PLATFORM), omap4)
LOCAL_CFLAGS += -DWORKAROUND_BUG_10194508=1
endif
ifeq ($(BOARD_EGL_WORKAROUND_BUG_10194508),true) ifeq ($(BOARD_EGL_WORKAROUND_BUG_10194508),true)
LOCAL_CFLAGS += -DWORKAROUND_BUG_10194508=1 LOCAL_CFLAGS += -DWORKAROUND_BUG_10194508=1
endif endif

3
services/surfaceflinger/SurfaceFlinger.cpp
View File

@ -2249,8 +2249,7 @@ void SurfaceFlinger::setTransactionState(
if (s.client != NULL) { if (s.client != NULL) {
sp<IBinder> binder = IInterface::asBinder(s.client); sp<IBinder> binder = IInterface::asBinder(s.client);
if (binder != NULL) { if (binder != NULL) {
String16 desc(binder->getInterfaceDescriptor()); if (binder->queryLocalInterface(ISurfaceComposerClient::descriptor) != NULL) {
if (desc == ISurfaceComposerClient::descriptor) {
sp<Client> client( static_cast<Client *>(s.client.get()) ); sp<Client> client( static_cast<Client *>(s.client.get()) );
transactionFlags |= setClientStateLocked(client, s.state); transactionFlags |= setClientStateLocked(client, s.state);
} }