diff options
author | sanketk <sanketk@codeaurora.org> | 2015-06-26 18:20:39 +0800 |
---|---|---|
committer | Scott Mertz <scott@cyngn.com> | 2015-10-09 13:37:35 -0700 |
commit | 76ea4d744c7dcf4bd5a33ce2067931daccb480e9 (patch) | |
tree | 1e7bfebbd4ee6c55a8a4e0b9b08bb06e491fbb7b | |
parent | 67c32f79eb2f4e3c9ae0110baaa9a5bf14fb0827 (diff) | |
download | android_external_connectivity-76ea4d744c7dcf4bd5a33ce2067931daccb480e9.tar.gz android_external_connectivity-76ea4d744c7dcf4bd5a33ce2067931daccb480e9.tar.bz2 android_external_connectivity-76ea4d744c7dcf4bd5a33ce2067931daccb480e9.zip |
add support for legacy wqe featurestable/cm-12.1-YOG7D
add support for legacy wqe feature.
CRs-fixed: 865158
SAMBAR-214
Change-Id: I5ed0b2b0f3ecfe6ff47c83599306303921af6f7d
(cherry picked from commit 055dc928765ea538210a21e7ba10bfd26ed2f393)
-rwxr-xr-x[-rw-r--r--] | cnefeatureconfig/inc/CneFeatureConfig.h | 3 | ||||
-rwxr-xr-x[-rw-r--r--] | cnefeatureconfig/src/CneFeatureConfig.cpp | 17 |
2 files changed, 16 insertions, 4 deletions
diff --git a/cnefeatureconfig/inc/CneFeatureConfig.h b/cnefeatureconfig/inc/CneFeatureConfig.h index 0b1ff6f..fb612b8 100644..100755 --- a/cnefeatureconfig/inc/CneFeatureConfig.h +++ b/cnefeatureconfig/inc/CneFeatureConfig.h @@ -40,6 +40,7 @@ enum Feature { WQE = 3, NSRM = 4, ATP = 5, + WQE_LEGACY=6, }; #include <cutils/log.h> @@ -99,6 +100,7 @@ private: bool bWqe; bool bNsrm; bool bAtp; + bool bWqeLegacy; /* Reads the CNE_FEATURE_PROP to determine which features are currently enabled.*/ void readFeature(void); @@ -125,6 +127,7 @@ private: ATP_CNE = 7, /* CNE feature is prerequisite */ ATP_NSRM_CNE = 8, /* CNE feature is prerequisite */ ATP_NSRM_WQE_CNE = 9, /* CNE feature is prerequisite */ + WQE_LEGACY_CNE = 99, /*legacy WQE (with interface selection) is prerequisite*/ }; public: diff --git a/cnefeatureconfig/src/CneFeatureConfig.cpp b/cnefeatureconfig/src/CneFeatureConfig.cpp index ad0d460..87ced7f 100644..100755 --- a/cnefeatureconfig/src/CneFeatureConfig.cpp +++ b/cnefeatureconfig/src/CneFeatureConfig.cpp @@ -67,7 +67,8 @@ CneFeatureConfig::CneFeatureConfig():bCne(false), bFmc(false), bWqe(false), bNsrm(false), - bAtp(false) + bAtp(false), + bWqeLegacy(false) { } @@ -100,15 +101,14 @@ void CneFeatureConfig::readFeature(void) { bFmc = true; break; } - case NSRM_CNE: // 3--> CNE enabled. NSRM mode. + case NSRM_CNE: // 4--> CNE enabled. NSRM mode. { bCne = true; bNsrm = true; break; } - case WQE_CNE: // 4--> CNE enabled. WQE mode. + case WQE_CNE: // 3--> CNE enabled. WQE mode. { - bCne = true; bWqe = true; break; } @@ -147,6 +147,12 @@ void CneFeatureConfig::readFeature(void) { bWqe = true; break; } + case WQE_LEGACY_CNE: //99 --> CNE enabled. Legacy WQE mode. + { + bCne = true; + bWqeLegacy = true; + break; + } default: CFC_LOGW("Unknown feature value in property. Features disabled by default"); } @@ -170,6 +176,9 @@ bool CneFeatureConfig::isEnabled(Feature f) { case ATP: return bAtp; break; + case WQE_LEGACY: + return bWqeLegacy; + break; default: CFC_LOGW("Feature %d not known, returning default", f); return false; |