Merge "Suppress -Wstring-plus-int warning" am: 63c89a37fd
am: c144802d6b
Change-Id: I7d6dd491fe56ea6a7af7bb8cd105ba616826fc40
This commit is contained in:
commit
4260f8b2cb
1 changed files with 3 additions and 0 deletions
|
|
@ -413,6 +413,8 @@ int __android_log_buf_write(int bufID, int prio, const char* tag, const char* ms
|
||||||
if (!tag) tag = "";
|
if (!tag) tag = "";
|
||||||
|
|
||||||
/* XXX: This needs to go! */
|
/* XXX: This needs to go! */
|
||||||
|
#pragma clang diagnostic push
|
||||||
|
#pragma clang diagnostic ignored "-Wstring-plus-int"
|
||||||
if (bufID != LOG_ID_RADIO) {
|
if (bufID != LOG_ID_RADIO) {
|
||||||
switch (tag[0]) {
|
switch (tag[0]) {
|
||||||
case 'H':
|
case 'H':
|
||||||
|
|
@ -454,6 +456,7 @@ int __android_log_buf_write(int bufID, int prio, const char* tag, const char* ms
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#pragma clang diagnostic pop
|
||||||
|
|
||||||
#if __BIONIC__
|
#if __BIONIC__
|
||||||
if (prio == ANDROID_LOG_FATAL) {
|
if (prio == ANDROID_LOG_FATAL) {
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue