Merge "Fix complaints about mismatched new/delete"

    mService->cleanupConnection(this);

    if (mEventCache != NULL) {

        delete mEventCache;

        delete[] mEventCache;

    }

    mDestroyed = true;

}

        wp<const SensorEventConnection> const * mapFlushEventsToConnections) {

    // filter out events not for this connection

    sensors_event_t* sanitizedBuffer = nullptr;

    std::unique_ptr<sensors_event_t[]> sanitizedBuffer;

    int count = 0;

    Mutex::Autolock _l(mConnectionLock);

            scratch = const_cast<sensors_event_t *>(buffer);

            count = numEvents;

        } else {

            scratch = sanitizedBuffer = new sensors_event_t[numEvents];

            sanitizedBuffer.reset(new sensors_event_t[numEvents]);

            scratch = sanitizedBuffer.get();

            for (size_t i = 0; i < numEvents; i++) {

                if (buffer[i].type == SENSOR_TYPE_META_DATA) {

                    scratch[count++] = buffer[i++];

    sendPendingFlushEventsLocked();

    // Early return if there are no events for this connection.

    if (count == 0) {

        delete sanitizedBuffer;

        return status_t(NO_ERROR);

    }

            // the max cache size that is desired.

            if (mCacheSize + count < computeMaxCacheSizeLocked()) {

                reAllocateCacheLocked(scratch, count);

                delete sanitizedBuffer;

                return status_t(NO_ERROR);

            }

            // Some events need to be dropped.

            memcpy(&mEventCache[mCacheSize - numEventsDropped], scratch + remaningCacheSize,

                                            numEventsDropped * sizeof(sensors_event_t));

        }

        delete sanitizedBuffer;

        return status_t(NO_ERROR);

    }

        // Add this file descriptor to the looper to get a callback when this fd is available for

        // writing.

        updateLooperRegistrationLocked(mService->getLooper());

        delete sanitizedBuffer;

        return size;

    }

    }

#endif

    delete sanitizedBuffer;

    return size < 0 ? status_t(size) : status_t(NO_ERROR);

}

    ALOGD_IF(DEBUG_CONNECTIONS, "reAllocateCacheLocked maxCacheSize=%d %d", mMaxCacheSize,

            new_cache_size);

    delete mEventCache;

    delete[] mEventCache;

    mEventCache = eventCache_new;

    mCacheSize += count;

    mMaxCacheSize = new_cache_size;