Merge "Add radio HAL stub to the build list; fix format warning." am: cd4bc27771

am: 9e1874d6a3

Change-Id: I01a1c7aa5db67f4bb368fbadc5939fd1fc3df5c8

modules/Android.mk

@@ -1,4 +1,14 @@
-hardware_modules := gralloc hwcomposer \
-	usbaudio audio_remote_submix camera usbcamera sensors \
-	input vehicle thermal vr
+hardware_modules := \
+    audio_remote_submix \
+    camera \
+    gralloc \
+    hwcomposer \
+    input \
+    radio \
+    sensors \
+    thermal \
+    usbaudio \
+    usbcamera \
+    vehicle \
+    vr
 include $(call all-named-subdir-makefiles,$(hardware_modules))

modules/radio/radio_hw.c

@@ -189,7 +189,7 @@ static int add_bitmap_metadata(radio_metadata_t **metadata, radio_metadata_key_t
 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;
 }