merge external/connectivity to jb

Change-Id: I0b911d382e958841f943422c017600beccdb26bf

1 files changed, 3 insertions, 4 deletions

diff --git a/cnefeatureconfig/src/CneFeatureConfig.cpp b/cnefeatureconfig/src/CneFeatureConfig.cpp
index f25774b..09592e4 100644
--- a/cnefeatureconfig/src/CneFeatureConfig.cpp
+++ b/cnefeatureconfig/src/CneFeatureConfig.cpp
@@ -35,7 +35,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include<cstring>
 #include "CneFeatureConfig.h"
 #include <stdlib.h>
-#include <cutils/log.h>
 
 /*------------------------------------------------------------------------------
 * Preprocessor Definitions and Constants
@@ -55,7 +54,7 @@ bool isFeatureEnabled(int f)
         bEnabled = cneFeature->isEnabled((Feature) f);
         delete cneFeature;
     } else {
-        LOGE("Failed to instantiate CneFeatureConfig! Default = disabled");
+        CFC_LOGE("Failed to instantiate CneFeatureConfig! Default = disabled");
     }
 
     return bEnabled;
@@ -127,7 +126,7 @@ void CneFeatureConfig::readFeature(void) {
             break;
         }
         default:
-            LOGW("Unknown feature value in property. Features disabled by default");
+            CFC_LOGW("Unknown feature value in property. Features disabled by default");
     }
 }
 
@@ -147,7 +146,7 @@ bool CneFeatureConfig::isEnabled(Feature f) {
             return bWqe;
             break;
         default:
-            LOGW("Feature %d not known, returning default", f);
+            CFC_LOGW("Feature %d not known, returning default", f);
             return false;
     }