diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2014-01-08 16:42:54 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-01-08 16:42:54 -0800 |
| commit | 67c32f79eb2f4e3c9ae0110baaa9a5bf14fb0827 (patch) | |
| tree | b282825a92958a0d3c44313a9c44f4a4ed172287 /cnefeatureconfig/inc/CneFeatureConfig.h | |
| parent | 3a664fa51724a37727dc713d0d77bea70219ab18 (diff) | |
| parent | 503a7119df32dd14321997cce30f4729922891d2 (diff) | |
| download | android_external_connectivity-67c32f79eb2f4e3c9ae0110baaa9a5bf14fb0827.tar.gz android_external_connectivity-67c32f79eb2f4e3c9ae0110baaa9a5bf14fb0827.tar.bz2 android_external_connectivity-67c32f79eb2f4e3c9ae0110baaa9a5bf14fb0827.zip | |
Merge "Add new feature to cneFeatureConfig"staging/cm-12.1stable/cm-12.1-YOG3C
Diffstat (limited to 'cnefeatureconfig/inc/CneFeatureConfig.h')
| -rw-r--r-- | cnefeatureconfig/inc/CneFeatureConfig.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/cnefeatureconfig/inc/CneFeatureConfig.h b/cnefeatureconfig/inc/CneFeatureConfig.h index 6af8550..0b1ff6f 100644 --- a/cnefeatureconfig/inc/CneFeatureConfig.h +++ b/cnefeatureconfig/inc/CneFeatureConfig.h @@ -2,7 +2,7 @@ #define CneFeatureConfig_H /*========================================================================= - Copyright (c) 2012, The Linux Foundation. All rights reserved. + Copyright (c) 2012, 2014 The Linux Foundation. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are @@ -39,6 +39,7 @@ enum Feature { FMC = 2, WQE = 3, NSRM = 4, + ATP = 5, }; #include <cutils/log.h> @@ -97,6 +98,7 @@ private: bool bFmc; bool bWqe; bool bNsrm; + bool bAtp; /* Reads the CNE_FEATURE_PROP to determine which features are currently enabled.*/ void readFeature(void); @@ -120,6 +122,9 @@ private: NSRM_CNE = 4, /* CNE feature is prerequisite */ FMC_NSRM_CNE = 5, /* CNE feature is prerequisite */ WQE_NSRM_CNE = 6, /* CNE feature is prerequisite */ + ATP_CNE = 7, /* CNE feature is prerequisite */ + ATP_NSRM_CNE = 8, /* CNE feature is prerequisite */ + ATP_NSRM_WQE_CNE = 9, /* CNE feature is prerequisite */ }; public: |