commit c37e6fe0ce71f265f3503065e1c61ff3a2ce9593
author Eric Laurent <elaurent@google.com> Tue Oct 25 11:20:54 2016 -0700
committer Eric Laurent <elaurent@google.com> Tue Oct 25 14:26:29 2016 -0700
tree 12653dff030c418c6451ba1c39681f767cc03397
parent ce379929878b5dc61f2d243e84e83b7532fb9d1e

radio: fixes in stub FM radio HAL.

Change-Id: I0adf39a08a364ffdecb1c7f618190174804865f4

modules/radio/radio_hw.c

diff --git a/modules/radio/radio_hw.c b/modules/radio/radio_hw.c
index fbf8c94..a4db565 100644
--- a/modules/radio/radio_hw.c
+++ b/modules/radio/radio_hw.c
@@ -189,7 +189,7 @@
 exit:
     close(fd);
     free(data);
-    ALOGE_IF(ret != 0, "%s error %d", __func__, ret);
+    ALOGE_IF(ret != 0, "%s error %d", __func__, (int)ret);
     return (int)ret;
 }
 
@@ -209,6 +209,7 @@
     *metadata = NULL;
 
     ret = radio_metadata_allocate(metadata, tuner->program.channel, 0);
+
     if (ret != 0)
         return ret;
 
@@ -220,14 +221,14 @@
         if (ret != 0)
             goto exit;
         ret = add_bitmap_metadata(metadata, RADIO_METADATA_KEY_ICON, BITMAP_FILE_PATH);
-        if (ret != 0)
+        if (ret != 0 && ret != -EPIPE)
             goto exit;
         ret = radio_metadata_add_clock(metadata, RADIO_METADATA_KEY_CLOCK, &hw_clock);
         if (ret != 0)
             goto exit;
     } else {
         ret = add_bitmap_metadata(metadata, RADIO_METADATA_KEY_ART, BITMAP_FILE_PATH);
-        if (ret != 0)
+        if (ret != 0 && ret != -EPIPE)
             goto exit;
     }
 
@@ -418,7 +419,6 @@
                         event.type = RADIO_EVENT_METADATA;
                         event.metadata = metadata;
                     }
-                    send_meta_data = true;
                 } break;
 
                 case CMD_CANCEL: {