diff options
| author | Wink Saville <> | 2009-04-02 11:00:57 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-04-02 11:00:57 -0700 |
| commit | 89efdc9c7f4005032dad86dd6dd220c23a7ff4d7 (patch) | |
| tree | a7944cb06826e8f9338fb35d6bb12299d946ca93 /liblog | |
| parent | 0b022b894215ce8c14da1a6ce236ed9c694ef78a (diff) | |
| download | system_core-89efdc9c7f4005032dad86dd6dd220c23a7ff4d7.tar.gz system_core-89efdc9c7f4005032dad86dd6dd220c23a7ff4d7.tar.bz2 system_core-89efdc9c7f4005032dad86dd6dd220c23a7ff4d7.zip | |
AI 144245: Fix merge conflict for megering in the CDMA changes in to master from donutburger.
Automated import of CL 144245
Diffstat (limited to 'liblog')
| -rw-r--r-- | liblog/logd_write.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/liblog/logd_write.c b/liblog/logd_write.c index 80867d1d5..96da38b6c 100644 --- a/liblog/logd_write.c +++ b/liblog/logd_write.c @@ -143,12 +143,16 @@ int __android_log_write(int prio, const char *tag, const char *msg) /* XXX: This needs to go! */ if (!strcmp(tag, "HTC_RIL") || !strcmp(tag, "RILJ") || + !strcmp(tag, "RILB") || !strcmp(tag, "RILC") || !strcmp(tag, "RILD") || !strcmp(tag, "RIL") || !strcmp(tag, "AT") || !strcmp(tag, "GSM") || - !strcmp(tag, "STK")) + !strcmp(tag, "STK") || + !strcmp(tag, "CDMA") || + !strcmp(tag, "PHONE") || + !strcmp(tag, "SMS")) log_id = LOG_ID_RADIO; vec[0].iov_base = (unsigned char *) &prio; |