summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSusheel Yadagiri <syadagir@codeaurora.org>2010-09-21 11:35:52 -0700
committerSusheel Yadagiri <syadagir@codeaurora.org>2010-09-21 11:35:52 -0700
commitc82b7782d5a012981d3ac4c260c4a7a145e0b2ad (patch)
tree16aebc93dbdfc5b7b6b888132996d254442d620e
parent563ea67be9855621d5808168e890615cc29f37cd (diff)
downloadandroid_external_connectivity-c82b7782d5a012981d3ac4c260c4a7a145e0b2ad.tar.gz
android_external_connectivity-c82b7782d5a012981d3ac4c260c4a7a145e0b2ad.tar.bz2
android_external_connectivity-c82b7782d5a012981d3ac4c260c4a7a145e0b2ad.zip
external/connectivity: Change persist.cne.useCne property to non boolean.
combine the persist.cne.UseCne and persist.cne.LoadVendorCne to one property by making persist.cne.UseCne to take one of the following three values 1. vendor 2. referece 3. none (default). Change-Id: Ie598764f026f902df655672d5f8c58bcda3453c6
-rw-r--r--cnd/src/cnd.c6
-rw-r--r--cnd/src/cnd_event.cpp6
2 files changed, 6 insertions, 6 deletions
diff --git a/cnd/src/cnd.c b/cnd/src/cnd.c
index 5c3555b..a42cb9b 100644
--- a/cnd/src/cnd.c
+++ b/cnd/src/cnd.c
@@ -27,10 +27,10 @@
int main (int argc, char **argv)
{
char prop_value[PROPERTY_VALUE_MAX] = {'\0'};
- int len = property_get("persist.cne.UseCne", prop_value, "FALSE");
+ int len = property_get("persist.cne.UseCne", prop_value, "none");
prop_value[len] = '\0';
- if((strcmp(prop_value, "TRUE") == 0) ||
- (strcmp(prop_value, "true") == 0))
+ if((strcasecmp(prop_value, "vendor") == 0) ||
+ (strcasecmp(prop_value, "reference") == 0))
{
cnd_init();
cnd_startEventLoop();
diff --git a/cnd/src/cnd_event.cpp b/cnd/src/cnd_event.cpp
index 2002242..519620d 100644
--- a/cnd/src/cnd_event.cpp
+++ b/cnd/src/cnd_event.cpp
@@ -152,11 +152,11 @@ int cnd_event_init()
void* cneLibHandle;
cneIntFnType cne_svc_init = NULL;
char prop_value[PROPERTY_VALUE_MAX] = {'\0'};
- int len = property_get("persist.cne.loadVendorCne", prop_value, "FALSE");
+ int len = property_get("persist.cne.UseCne", prop_value, "none");
prop_value[len] = '\0';
- if((strcmp(prop_value, "TRUE") == 0) ||(strcmp(prop_value, "true") == 0))
+ if(strcasecmp(prop_value, "vendor") == 0)
{
- LOGI("loading cne library!!");
+ LOGI("loading vendor cne library!!");
cneLibHandle = dlopen("/system/lib/libcne.so",RTLD_NOW);
}
else