Merge "Dynamic Sensor Discovery implementation"

diff --combined libs/gui/Sensor.cpp
index a14e633,a6cb908..0b2b942
--- 1/libs/gui/Sensor.cpp
--- 2/libs/gui/Sensor.cpp
+++ b/libs/gui/Sensor.cpp
@@@ -188,7 -188,7 +188,7 @@@ Sensor::Sensor(struct sensor_t const* h
          if (halVersion < SENSORS_DEVICE_API_VERSION_1_3) {
              mFlags |= SENSOR_FLAG_WAKE_UP;
          }
-          break;
+         break;
      case SENSOR_TYPE_WAKE_GESTURE:
          mStringType = SENSOR_STRING_TYPE_WAKE_GESTURE;
          mFlags |= SENSOR_FLAG_ONE_SHOT_MODE;
@@@ -217,28 -217,10 +217,32 @@@
              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) {
@@@ -390,13 -372,18 +394,18 @@@ int32_t Sensor::getReportingMode() cons
      return ((mFlags & REPORTING_MODE_MASK) >> REPORTING_MODE_SHIFT);
  }
  
+ const Sensor::uuid_t& Sensor::getUuid() const {
+     return mUuid;
+ }
+ 
  size_t Sensor::getFlattenedSize() const
  {
      size_t fixedSize =
-             sizeof(int32_t) * 3 +
-             sizeof(float) * 4 +
-             sizeof(int32_t) * 6 +
-             sizeof(bool);
+             sizeof(mVersion) + sizeof(mHandle) + sizeof(mType) +
+             sizeof(mMinValue) + sizeof(mMaxValue) + sizeof(mResolution) +
+             sizeof(mPower) + sizeof(mMinDelay) + sizeof(mFifoMaxEventCount) +
+             sizeof(mFifoMaxEventCount) + sizeof(mRequiredPermissionRuntime) +
+             sizeof(mRequiredAppOp) + sizeof(mMaxDelay) + sizeof(mFlags) + sizeof(mUuid);
  
      size_t variableSize =
              sizeof(uint32_t) + FlattenableUtils::align<4>(mName.length()) +
@@@ -430,6 -417,7 +439,7 @@@ status_t Sensor::flatten(void* buffer, 
      FlattenableUtils::write(buffer, size, mRequiredAppOp);
      FlattenableUtils::write(buffer, size, mMaxDelay);
      FlattenableUtils::write(buffer, size, mFlags);
+     FlattenableUtils::write(buffer, size, mUuid);
      return NO_ERROR;
  }
  
@@@ -441,11 -429,11 +451,11 @@@ status_t Sensor::unflatten(void const* 
          return NO_MEMORY;
      }
  
-     size_t fixedSize =
-             sizeof(int32_t) * 3 +
-             sizeof(float) * 4 +
-             sizeof(int32_t) * 5;
-     if (size < fixedSize) {
+     size_t fixedSize1 =
+             sizeof(mVersion) + sizeof(mHandle) + sizeof(mType) + sizeof(mMinValue) +
+             sizeof(mMaxValue) + sizeof(mResolution) + sizeof(mPower) + sizeof(mMinDelay) +
+             sizeof(mFifoMaxEventCount) + sizeof(mFifoMaxEventCount);
+     if (size < fixedSize1) {
          return NO_MEMORY;
      }
  
@@@ -466,10 -454,19 +476,19 @@@
      if (!unflattenString8(buffer, size, mRequiredPermission)) {
          return NO_MEMORY;
      }
+ 
+     size_t fixedSize2 =
+             sizeof(mRequiredPermissionRuntime) + sizeof(mRequiredAppOp) + sizeof(mMaxDelay) +
+             sizeof(mFlags) + sizeof(mUuid);
+     if (size < fixedSize2) {
+         return NO_MEMORY;
+     }
+ 
      FlattenableUtils::read(buffer, size, mRequiredPermissionRuntime);
      FlattenableUtils::read(buffer, size, mRequiredAppOp);
      FlattenableUtils::read(buffer, size, mMaxDelay);
      FlattenableUtils::read(buffer, size, mFlags);
+     FlattenableUtils::read(buffer, size, mUuid);
      return NO_ERROR;
  }