Merge "Fix uninitialized pointer dereference when loading default radio module." am: 94388e4b63 am: e5bad5f89a
am: 2ab6368f1c
Change-Id: I660ebdec3573621c7f51050d5483b5f8bafc092f
diff --git a/services/radio/RadioService.cpp b/services/radio/RadioService.cpp
index 5a3f750..3448678 100644
--- a/services/radio/RadioService.cpp
+++ b/services/radio/RadioService.cpp
@@ -84,10 +84,11 @@
radio_properties_t properties;
properties.handle =
(radio_handle_t)android_atomic_inc(&mNextUniqueId);
-
- ALOGI("loaded default module %s, handle %d", properties.product, properties.handle);
-
convertProperties(&properties, &halProperties);
+
+ ALOGI("loaded default module %s, ver %s, handle %d", properties.product,
+ properties.version, properties.handle);
+
sp<Module> module = new Module(dev, properties);
mModules.add(properties.handle, module);
}