commit cd4bc277716ae1858b40c7b928a68a0f6fd8b19d
author Tomasz Wasilczyk <twasilczyk@google.com> Thu Feb 09 20:17:48 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Feb 09 20:17:49 2017 +0000
tree a8bf0493fb0bca068d0c03fc33e805914aba8ff8
parent a0ce42c71094713efa0555a1d32945eecf6880cc
parent dd2f59e4abb306221a7a1c783c66e493aa490a49

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

modules/Android.mk

diff --git a/modules/Android.mk b/modules/Android.mk
index 2a58b3e..462081d 100644
--- a/modules/Android.mk
+++ b/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

diff --git a/modules/radio/radio_hw.c b/modules/radio/radio_hw.c
index fbf8c94..09f07b1 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;
 }