resolved conflicts for 8dba9a7b to master

Change-Id: I314e3fc4dffbff1f7030533a821696692d03b33d
This commit is contained in:
Sergio Giro 2015-09-23 22:03:30 +01:00
commit 21ca798137

View file

@ -14,13 +14,15 @@
* limitations under the License.
*/
#include <utils/SharedBuffer.h>
#define __STDC_LIMIT_MACROS
#include <gtest/gtest.h>
#include <memory>
#include <stdint.h>
#include "SharedBuffer.h"
TEST(SharedBufferTest, TestAlloc) {
EXPECT_DEATH(android::SharedBuffer::alloc(SIZE_MAX), "");
EXPECT_DEATH(android::SharedBuffer::alloc(SIZE_MAX - sizeof(android::SharedBuffer)), "");