summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKisub Song <kisubs.song@samsung.com>2012-09-07 16:46:54 +0900
committerKisub Song <kisubs.song@samsung.com>2012-09-07 16:46:54 +0900
commit5d668de8b44273dc71aaa6ebecea2fa74aefc75d (patch)
tree74bdbdbbe1aec40694cf2a6c71d6156a1b188290
parent75d658b6d2178c9e6a6f8dace3cb42685d4f25ff (diff)
downloadwrt-plugins-tizen-5d668de8b44273dc71aaa6ebecea2fa74aefc75d.tar.gz
wrt-plugins-tizen-5d668de8b44273dc71aaa6ebecea2fa74aefc75d.tar.bz2
wrt-plugins-tizen-5d668de8b44273dc71aaa6ebecea2fa74aefc75d.zip
Update change log and spec for wrt-plugins-tizen_0.2.80
Changed Modules : SystemInfo [Version] 0.2.80 [Project] GT-I8800, Public [Title] SEL Verification [Team] WebAPI [BinType] PDA [Customer] Open [Issue#] N/A [Problem] Cellularnetwork status attribute's mean is wrong. [Cause] change getPropertyValue API about CellularNetwork [Solution] Chanage spec & Chanage code [Issue#] WEB-1850 [Problem] if property attribute's value is null, occured crash [Cause] getpropertyvalue api crash [Solution] added protect code [SCMRequest] N/A Change-Id: I51a90223214e9e15a719714286d13fdf7b02cf36
-rw-r--r--debian/changelog8
-rwxr-xr-xpackaging/wrt-plugins-tizen.spec2
-rwxr-xr-xsrc/platform/Tizen/Systeminfo/Systeminfo.cpp77
3 files changed, 54 insertions, 33 deletions
diff --git a/debian/changelog b/debian/changelog
index cf7c3e8..d5fc811 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+wrt-plugins-tizen (0.2.80) unstable; urgency=low
+
+ * Bug fix on Systeminfo
+ * Git : slp/pkgs/w/wrt-plugins-tizen
+ * Tag : wrt-plugins-tizen_0.2.80
+
+ -- Kisub Song <kisubs.song@samsung.com> Fri, 07 Sep 2012 16:39:48 +0900
+
wrt-plugins-tizen (0.2.79) unstable; urgency=low
* Bug fix on MediaContent
diff --git a/packaging/wrt-plugins-tizen.spec b/packaging/wrt-plugins-tizen.spec
index 3ee46cb..ca4b6d3 100755
--- a/packaging/wrt-plugins-tizen.spec
+++ b/packaging/wrt-plugins-tizen.spec
@@ -1,6 +1,6 @@
Name: wrt-plugins-tizen
Summary: JavaScript plugins for WebRuntime
-Version: 0.2.79
+Version: 0.2.80
Release: 0
Group: TO_BE_FILLED
License: TO_BE_FILLED
diff --git a/src/platform/Tizen/Systeminfo/Systeminfo.cpp b/src/platform/Tizen/Systeminfo/Systeminfo.cpp
index 34ca9a5..a2097cf 100755
--- a/src/platform/Tizen/Systeminfo/Systeminfo.cpp
+++ b/src/platform/Tizen/Systeminfo/Systeminfo.cpp
@@ -988,6 +988,7 @@ PROPERTY_GET_SYSTEMINFO_DEFINITION(WifiNetwork) {
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) {
@@ -1015,42 +1016,44 @@ PROPERTY_GET_SYSTEMINFO_DEFINITION(CellularNetwork) {
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);
}
@@ -1063,11 +1066,13 @@ PROPERTY_GET_SYSTEMINFO_DEFINITION(Device) {
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);
}
@@ -1110,9 +1115,11 @@ PROPERTY_GET_SYSTEMINFO_DEFINITION(SIM) {
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);
}
}
@@ -1121,6 +1128,7 @@ PROPERTY_GET_SYSTEMINFO_DEFINITION(SIM) {
if (msisdn) {
SIM->msisdn = msisdn;
LogDebug("msisdn : " << SIM->msisdn);
+ free(msisdn);
}
}
@@ -1129,6 +1137,7 @@ PROPERTY_GET_SYSTEMINFO_DEFINITION(SIM) {
if (icc_id) {
SIM->iccid = icc_id;
LogDebug("iccid : " << SIM->iccid);
+ free(icc_id);
}
}
@@ -1137,6 +1146,7 @@ PROPERTY_GET_SYSTEMINFO_DEFINITION(SIM) {
if (mcc) {
SIM->mcc = atoi(mcc);
LogDebug("mcc : " << SIM->mcc);
+ free(mcc);
}
}
@@ -1145,6 +1155,7 @@ PROPERTY_GET_SYSTEMINFO_DEFINITION(SIM) {
if (mnc) {
SIM->mnc = atoi(mnc);
LogDebug("mnc : " << SIM->mnc);
+ free(mnc);
}
}
@@ -1153,6 +1164,7 @@ PROPERTY_GET_SYSTEMINFO_DEFINITION(SIM) {
if (msin) {
SIM->msin = msin;
LogDebug("msin : " << SIM->msin);
+ free(msin);
}
}
@@ -1161,6 +1173,7 @@ PROPERTY_GET_SYSTEMINFO_DEFINITION(SIM) {
if (spn) {
SIM->spn = spn;
LogDebug("spn : " << SIM->spn);
+ free(spn);
}
}