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

Commit 85f67847 authored by The Android Automerger's avatar The Android Automerger
Browse files

Merge branch 'master' into honeycomb-release

parents 63e20850 d379cda9

libs/binder/CursorWindow.cpp

+4 −2
Original line number Diff line number Diff line
@@ -219,7 +219,8 @@ LOG_WINDOW("follwing 'pointer' to next chunk, offset of next pointer is %d", chu 
field_slot_t * CursorWindow::getFieldSlotWithCheck(int row, int column)

{

  if (row < 0 || row >= mHeader->numRows || column < 0 || column >= mHeader->numColumns) {

      LOGE("Bad request for field slot %d,%d. numRows = %d, numColumns = %d", row, column, mHeader->numRows, mHeader->numColumns);

      LOGE("Failed to read row# %d, column# from a CursorWindow which has %d rows, %d columns.",

              row, column, mHeader->numRows, mHeader->numColumns);

      return NULL;

  }        

  row_slot_t * rowSlot = getRowSlot(row);
@@ -238,7 +239,8 @@ field_slot_t * CursorWindow::getFieldSlotWithCheck(int row, int column) 
uint32_t CursorWindow::read_field_slot(int row, int column, field_slot_t * slotOut)

{

    if (row < 0 || row >= mHeader->numRows || column < 0 || column >= mHeader->numColumns) {

        LOGE("Bad request for field slot %d,%d. numRows = %d, numColumns = %d", row, column, mHeader->numRows, mHeader->numColumns);

        LOGE("Can't read row# %d, col# %d from CursorWindow. Make sure your Cursor is initialized correctly.",

                row, column);

        return -1;

    }        

    row_slot_t * rowSlot = getRowSlot(row);

opengl/tests/hwc/Android.mk

0 → 100644
+27 −0
Original line number Diff line number Diff line 
LOCAL_PATH:= $(call my-dir)



include $(CLEAR_VARS)

LOCAL_SRC_FILES:= hwc_stress.cpp



LOCAL_SHARED_LIBRARIES := \

    libcutils \

    libEGL \

    libGLESv2 \

    libui \

    libhardware \



LOCAL_STATIC_LIBRARIES := \

    libtestUtil \



LOCAL_C_INCLUDES += \

    system/extras/tests/include \

    hardware/libhardware/include \



LOCAL_MODULE:= hwc_stress

LOCAL_MODULE_PATH := $(TARGET_OUT_DATA)/nativestresstest



LOCAL_MODULE_TAGS := tests



LOCAL_CFLAGS := -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES



include $(BUILD_NATIVE_TEST)

opengl/tests/hwc/hwc_stress.cpp

0 → 100644
+1193 −0

File added.

Preview size limit exceeded, changes collapsed.