diff options
| author | Niranjan Pendharkar <npendhar@codeaurora.org> | 2012-07-11 21:21:35 -0700 |
|---|---|---|
| committer | Niranjan Pendharkar <npendhar@codeaurora.org> | 2012-07-13 10:23:38 -0700 |
| commit | 99e7c8e18f067ee69c1319f20d1cc0fb1d885783 (patch) | |
| tree | f26f783e3728fd36be7dabe0ef411c3df6b26f4f | |
| parent | ce48ea32ee8422fcf677e54cab4c3515c554b7bf (diff) | |
| download | android_external_connectivity-99e7c8e18f067ee69c1319f20d1cc0fb1d885783.tar.gz android_external_connectivity-99e7c8e18f067ee69c1319f20d1cc0fb1d885783.tar.bz2 android_external_connectivity-99e7c8e18f067ee69c1319f20d1cc0fb1d885783.zip | |
merge external/connectivity to jb
Change-Id: I0b911d382e958841f943422c017600beccdb26bf
| -rw-r--r-- | cnefeatureconfig/Android.mk | 2 | ||||
| -rw-r--r-- | cnefeatureconfig/inc/CneFeatureConfig.h | 32 | ||||
| -rw-r--r-- | cnefeatureconfig/src/CneFeatureConfig.cpp | 7 |
3 files changed, 36 insertions, 5 deletions
diff --git a/cnefeatureconfig/Android.mk b/cnefeatureconfig/Android.mk index 1ec969b..951e134 100644 --- a/cnefeatureconfig/Android.mk +++ b/cnefeatureconfig/Android.mk @@ -12,7 +12,7 @@ LOCAL_SHARED_LIBRARIES := libc libcutils libstlport \ LOCAL_C_INCLUDES := \ external/connectivity/cnefeatureconfig/inc \ - external/connectivity/stlport/stlport \ + external/connectivity/stlport/stlport LOCAL_REQUIRED_MODULES := \ external/connectivity/stlport diff --git a/cnefeatureconfig/inc/CneFeatureConfig.h b/cnefeatureconfig/inc/CneFeatureConfig.h index 7cab2b2..279019a 100644 --- a/cnefeatureconfig/inc/CneFeatureConfig.h +++ b/cnefeatureconfig/inc/CneFeatureConfig.h @@ -41,6 +41,38 @@ enum Feature { NSRM = 4, }; +#include <cutils/log.h> + +#ifdef LOGE +#define CFC_LOGE LOGE +#else +#define CFC_LOGE ALOGE +#endif + +#ifdef LOGW +#define CFC_LOGW LOGW +#else +#define CFC_LOGW ALOGW +#endif + +#ifdef LOGD +#define CFC_LOGD LOGD +#else +#define CFC_LOGD ALOGD +#endif + +#ifdef LOGI +#define CFC_LOGI LOGI +#else +#define CFC_LOGI ALOGI +#endif + +#ifdef LOGV +#define CFC_LOGV LOGV +#else +#define CFC_LOGV ALOGV +#endif + #define CNE_FEATURE_PROP "persist.cne.feature" #ifdef __cplusplus 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; } |