Merge mozilla-central into mozilla-inbound

This commit is contained in:
Ehsan Akhgari 2012-11-05 21:50:43 -05:00
commit f824c5dc5e

View File

@ -879,10 +879,9 @@ bool
IsDeviceConnectedTypeBoolean()
{
#if defined(MOZ_WIDGET_GONK)
char connProp[PROPERTY_VALUE_MAX];
property_get(PROP_DEVICE_CONNECTED_TYPE, connProp, "array");
property_get(PROP_DEVICE_CONNECTED_TYPE, connProp, "boolean");
if (strcmp(connProp, "boolean") == 0) {
return true;
}