ipAddr = vconf_get_str(VCONFKEY_NETWORK_IP);
if(ipAddr != NULL) {
wifiNetwork->ipAddress = ipAddr;
+ free(ipAddr);
}
memset(&ProfInfo, 0, sizeof(net_profile_info_t));
if (net_get_active_net_info(&ProfInfo) == NET_ERR_NONE) {
int isRoaming = 0;
int status = 0;
- if (vconf_get_int(VCONFKEY_NETWORK_STATUS, &status) == 0) {
- if (status == VCONFKEY_NETWORK_CELLULAR) {
+ if(vconf_get_int(VCONFKEY_TELEPHONY_SVCTYPE, &status) == 0) {
+ if (status > VCONFKEY_TELEPHONY_SVCTYPE_SEARCH) {
cellularNetwork->status = "ON";
- ipAddr = vconf_get_str(VCONFKEY_NETWORK_IP);
- if(ipAddr != NULL) {
- cellularNetwork->ipAddress = ipAddr;
- }
- memset(&ProfInfo, 0, sizeof(net_profile_info_t));
- if (net_get_active_net_info(&ProfInfo) == NET_ERR_NONE) {
- if(ProfInfo.profile_type == NET_DEVICE_CELLULAR) {
- cellularNetwork->apn = ProfInfo.ProfileInfo.Pdp.Apn;
-
- if (vconf_get_int(VCONFKEY_TELEPHONY_PLMN, &plmn) != 0) {
- LogDebug("vconf_get_int failed");
- } else {
- cellularNetwork->mcc = plmn / 1000;
- cellularNetwork->mnc = plmn % 1000;
- }
-
- if (vconf_get_int(VCONFKEY_TELEPHONY_CELLID, &cellid) == 0) {
- cellularNetwork->cellId = cellid;
- }
-
- if (vconf_get_int(VCONFKEY_TELEPHONY_LAC, &lac) != 0) {
- cellularNetwork->lac = lac;
- }
-
- if (vconf_get_int(VCONFKEY_SETAPPL_STATE_DATA_ROAMING_BOOL, &isRoaming) != 0) {
- cellularNetwork->isRoaming = (isRoaming == 0) ? false : true;
- }
- }
- }
} else {
cellularNetwork->status = "OFF";
}
}
+
+ ipAddr = vconf_get_str(VCONFKEY_NETWORK_IP);
+ if(ipAddr != NULL) {
+ cellularNetwork->ipAddress = ipAddr;
+ free(ipAddr);
+ }
+
+ if (vconf_get_int(VCONFKEY_TELEPHONY_PLMN, &plmn) == 0) {
+ cellularNetwork->mcc = plmn / 1000;
+ cellularNetwork->mnc = plmn % 1000;
+ }
+
+ if (vconf_get_int(VCONFKEY_TELEPHONY_CELLID, &cellid) == 0) {
+ cellularNetwork->cellId = cellid;
+ }
+
+ if (vconf_get_int(VCONFKEY_TELEPHONY_LAC, &lac) == 0) {
+ cellularNetwork->lac = lac;
+ }
+
+ if (vconf_get_int(VCONFKEY_SETAPPL_STATE_DATA_ROAMING_BOOL, &isRoaming) == 0) {
+ cellularNetwork->isRoaming = (isRoaming == 0) ? false : true;
+ }
+
+ memset(&ProfInfo, 0, sizeof(net_profile_info_t));
+ if (net_get_active_net_info(&ProfInfo) == NET_ERR_NONE) {
+ if(ProfInfo.profile_type == NET_DEVICE_CELLULAR) {
+ cellularNetwork->apn = ProfInfo.ProfileInfo.Pdp.Apn;
+ }
+ }
+
return Tizen1_0::JSCellularNetworkInfo::createJSObject(context, cellularNetwork);
}
if (system_info_get_value_string(SYSTEM_INFO_KEY_MOBILE_DEVICE_ID, &imei) == SYSTEM_INFO_ERROR_NONE) {
device->imei = imei;
+ free(imei);
LogDebug("imei : " << device->imei);
}
if (system_info_get_value_string(SYSTEM_INFO_KEY_MODEL, &model) == SYSTEM_INFO_ERROR_NONE) {
device->model = model;
+ free(model);
LogDebug("model : " << device->model);
}
if (full_name) {
SIM->operatorName = full_name;
LogDebug("operatorName : " << SIM->operatorName);
- } else {
+ free(full_name);
+ } else if (short_name) {
SIM->operatorName = short_name;
LogDebug("operatorName : " << SIM->operatorName);
+ free(short_name);
}
}
if (msisdn) {
SIM->msisdn = msisdn;
LogDebug("msisdn : " << SIM->msisdn);
+ free(msisdn);
}
}
if (icc_id) {
SIM->iccid = icc_id;
LogDebug("iccid : " << SIM->iccid);
+ free(icc_id);
}
}
if (mcc) {
SIM->mcc = atoi(mcc);
LogDebug("mcc : " << SIM->mcc);
+ free(mcc);
}
}
if (mnc) {
SIM->mnc = atoi(mnc);
LogDebug("mnc : " << SIM->mnc);
+ free(mnc);
}
}
if (msin) {
SIM->msin = msin;
LogDebug("msin : " << SIM->msin);
+ free(msin);
}
}
if (spn) {
SIM->spn = spn;
LogDebug("spn : " << SIM->spn);
+ free(spn);
}
}