commit 937458f7c21f7732acb48da2e96b98f887c69bce
author Jeff Sharkey <jsharkey@android.com> Mon Aug 13 11:37:39 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Aug 13 11:37:39 2012 -0700
tree 54121b91e34b4d5ecef048466f8a97a15f724537
parent 3424b4fdde67ea1d8f7b2a75c370cd0a93973e65
parent 84dcf091482b8d0f484e665915d354069a8c879b

am 84dcf091: Collapse IMS tags into a prefix check.

* commit '84dcf091482b8d0f484e665915d354069a8c879b':
  Collapse IMS tags into a prefix check.

liblog/logd_write.c

diff --git a/liblog/logd_write.c b/liblog/logd_write.c
index 168bdf8..b91de52 100644
--- a/liblog/logd_write.c
+++ b/liblog/logd_write.c
@@ -141,14 +141,13 @@
     /* XXX: This needs to go! */
     if (!strcmp(tag, "HTC_RIL") ||
         !strncmp(tag, "RIL", 3) || /* Any log tag with "RIL" as the prefix */
+        !strncmp(tag, "IMS", 3) || /* Any log tag with "IMS" as the prefix */
         !strcmp(tag, "AT") ||
         !strcmp(tag, "GSM") ||
         !strcmp(tag, "STK") ||
         !strcmp(tag, "CDMA") ||
         !strcmp(tag, "PHONE") ||
-        !strcmp(tag, "SMS") ||
-        !strcmp(tag, "IMS") ||
-        !strcmp(tag, "IMSFW"))
+        !strcmp(tag, "SMS"))
             log_id = LOG_ID_RADIO;
 
     vec[0].iov_base   = (unsigned char *) &prio;
@@ -171,14 +170,13 @@
     /* XXX: This needs to go! */
     if (!strcmp(tag, "HTC_RIL") ||
         !strncmp(tag, "RIL", 3) || /* Any log tag with "RIL" as the prefix */
+        !strncmp(tag, "IMS", 3) || /* Any log tag with "IMS" as the prefix */
         !strcmp(tag, "AT") ||
         !strcmp(tag, "GSM") ||
         !strcmp(tag, "STK") ||
         !strcmp(tag, "CDMA") ||
         !strcmp(tag, "PHONE") ||
-        !strcmp(tag, "SMS") ||
-        !strcmp(tag, "IMS") ||
-        !strcmp(tag, "IMSFW"))
+        !strcmp(tag, "SMS"))
             bufID = LOG_ID_RADIO;
 
     vec[0].iov_base   = (unsigned char *) &prio;