summaryrefslogtreecommitdiffstats
path: root/libs/utils/String8.cpp
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2012-01-09 18:35:44 +0000
committerSteve Block <steveblock@google.com>2012-01-09 21:36:22 +0000
commit6726347e8950d34ae162fb8d6a3680a871d359e2 (patch)
tree12823493d1b9718500ad69feb1d6670900863b88 /libs/utils/String8.cpp
parent375adfb954b0129e72f113f8a3f186e092b72c3e (diff)
downloadframeworks_native-6726347e8950d34ae162fb8d6a3680a871d359e2.zip
frameworks_native-6726347e8950d34ae162fb8d6a3680a871d359e2.tar.gz
frameworks_native-6726347e8950d34ae162fb8d6a3680a871d359e2.tar.bz2
Rename LOG_ASSERT to ALOG_ASSERT DO NOT MERGE
See https://android-git.corp.google.com/g/157519 Bug: 5449033 Change-Id: I8ceb2dba1b031a0fd68d15d146960d9ced62bbf3
Diffstat (limited to 'libs/utils/String8.cpp')
-rw-r--r--libs/utils/String8.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/utils/String8.cpp b/libs/utils/String8.cpp
index 0bc5aff..562f026 100644
--- a/libs/utils/String8.cpp
+++ b/libs/utils/String8.cpp
@@ -80,7 +80,7 @@ static char* allocFromUTF8(const char* in, size_t len)
{
if (len > 0) {
SharedBuffer* buf = SharedBuffer::alloc(len+1);
- LOG_ASSERT(buf, "Unable to allocate shared buffer");
+ ALOG_ASSERT(buf, "Unable to allocate shared buffer");
if (buf) {
char* str = (char*)buf->data();
memcpy(str, in, len);
@@ -103,7 +103,7 @@ static char* allocFromUTF16(const char16_t* in, size_t len)
}
SharedBuffer* buf = SharedBuffer::alloc(bytes+1);
- LOG_ASSERT(buf, "Unable to allocate shared buffer");
+ ALOG_ASSERT(buf, "Unable to allocate shared buffer");
if (!buf) {
return getEmptyString();
}
@@ -125,7 +125,7 @@ static char* allocFromUTF32(const char32_t* in, size_t len)
}
SharedBuffer* buf = SharedBuffer::alloc(bytes+1);
- LOG_ASSERT(buf, "Unable to allocate shared buffer");
+ ALOG_ASSERT(buf, "Unable to allocate shared buffer");
if (!buf) {
return getEmptyString();
}