Merge "Dynamic Sensor Discovery implementation"

diff --cc libs/gui/Sensor.cpp
index a14e633,a6cb908..0b2b942
--- 1/libs/gui/Sensor.cpp
--- 2/libs/gui/Sensor.cpp
+++ b/libs/gui/Sensor.cpp
@@@ -217,28 -217,10 +217,32 @@@ Sensor::Sensor(struct sensor_t const* h
              mFlags |= SENSOR_FLAG_WAKE_UP;
          }
          break;
+     case SENSOR_TYPE_DYNAMIC_SENSOR_META:
+         mStringType = SENSOR_STRING_TYPE_DYNAMIC_SENSOR_META;
+         mFlags = SENSOR_FLAG_SPECIAL_REPORTING_MODE; // special trigger and non-wake up
+         break;
 +    case SENSOR_TYPE_POSE_6DOF:
 +        mStringType = SENSOR_STRING_TYPE_POSE_6DOF;
 +        mFlags |= SENSOR_FLAG_CONTINUOUS_MODE;
 +        break;
 +    case SENSOR_TYPE_STATIONARY_DETECT:
 +        mStringType = SENSOR_STRING_TYPE_STATIONARY_DETECT;
 +        mFlags |= SENSOR_FLAG_ONE_SHOT_MODE;
 +        if (halVersion < SENSORS_DEVICE_API_VERSION_1_3) {
 +            mFlags |= SENSOR_FLAG_WAKE_UP;
 +        }
 +        break;
 +    case SENSOR_TYPE_MOTION_DETECT:
 +        mStringType = SENSOR_STRING_TYPE_MOTION_DETECT;
 +        mFlags |= SENSOR_FLAG_ONE_SHOT_MODE;
 +        if (halVersion < SENSORS_DEVICE_API_VERSION_1_3) {
 +            mFlags |= SENSOR_FLAG_WAKE_UP;
 +        }
 +        break;
 +    case SENSOR_TYPE_HEART_BEAT:
 +        mStringType = SENSOR_STRING_TYPE_HEART_BEAT;
 +        mFlags |= SENSOR_FLAG_SPECIAL_REPORTING_MODE;
 +        break;
      default:
          // Only pipe the stringType, requiredPermission and flags for custom sensors.
          if (halVersion > SENSORS_DEVICE_API_VERSION_1_0 && hwSensor->stringType) {