Snap for 5335706 from 86028528d62951e8b323d0aba55a6e85563253a0 to qt-releaseandroid-vts-10.0_r9android-vts-10.0_r8android-vts-10.0_r7android-vts-10.0_r6android-vts-10.0_r5android-vts-10.0_r4android-vts-10.0_r3android-vts-10.0_r2android-vts-10.0_r16android-vts-10.0_r15android-vts-10.0_r14android-vts-10.0_r13android-vts-10.0_r12android-vts-10.0_r11android-vts-10.0_r10android-vts-10.0_r1android-security-10.0.0_r75android-security-10.0.0_r74android-security-10.0.0_r73android-security-10.0.0_r72android-security-10.0.0_r71android-security-10.0.0_r70android-security-10.0.0_r69android-security-10.0.0_r68android-security-10.0.0_r67android-security-10.0.0_r66android-security-10.0.0_r65android-security-10.0.0_r64android-security-10.0.0_r63android-security-10.0.0_r62android-security-10.0.0_r61android-security-10.0.0_r60android-security-10.0.0_r59android-security-10.0.0_r58android-security-10.0.0_r57android-security-10.0.0_r56android-security-10.0.0_r55android-security-10.0.0_r54android-security-10.0.0_r53android-security-10.0.0_r52android-security-10.0.0_r51android-security-10.0.0_r50android-security-10.0.0_r49android-security-10.0.0_r48android-mainline-10.0.0_r3android-mainline-10.0.0_r2android-mainline-10.0.0_r1android-cts-10.0_r9android-cts-10.0_r8android-cts-10.0_r7android-cts-10.0_r6android-cts-10.0_r5android-cts-10.0_r4android-cts-10.0_r3android-cts-10.0_r2android-cts-10.0_r16android-cts-10.0_r15android-cts-10.0_r14android-cts-10.0_r13android-cts-10.0_r12android-cts-10.0_r11android-cts-10.0_r10android-cts-10.0_r1android-10.0.0_r6android-10.0.0_r5android-10.0.0_r47android-10.0.0_r46android-10.0.0_r4android-10.0.0_r3android-10.0.0_r2android-10.0.0_r17android-10.0.0_r11android-10.0.0_r10android-10.0.0_r1android10-tests-releaseandroid10-security-releaseandroid10-s3-releaseandroid10-s2-releaseandroid10-s1-releaseandroid10-releaseandroid10-mainline-releaseandroid10-mainline-a-release

Change-Id: I2ff544fdac653cd50aa6625e4b7dcea97a459fde

3 files changed, 23 insertions, 4 deletions

diff --git a/util/nanotool/contexthub.cpp b/util/nanotool/contexthub.cpp
index 7a3df87b..e240d558 100644
--- a/util/nanotool/contexthub.cpp
+++ b/util/nanotool/contexthub.cpp
@@ -83,6 +83,7 @@ struct SensorTypeAlias {
 
 static const SensorTypeAlias sensor_aliases_[] = {
     { SensorType::Accel, SensorType::CompressedAccel, "compressed_accel" },
+    { SensorType::Magnetometer, SensorType::CompressedMag, "compressed_mag" },
 };
 
 bool SensorTypeIsAliasOf(SensorType sensor_type, SensorType alias) {
diff --git a/util/nanotool/contexthub.h b/util/nanotool/contexthub.h
index 8dfce260..582dacb0 100644
--- a/util/nanotool/contexthub.h
+++ b/util/nanotool/contexthub.h
@@ -70,6 +70,7 @@ enum class SensorType {
     Vsync,
     CompressedAccel,
     WristTilt = 39,
+    CompressedMag = 59,
     Humidity = 61,
 
     Max_
diff --git a/util/nanotool/sensorevent.cpp b/util/nanotool/sensorevent.cpp
index 5f095055..2f84fa77 100644
--- a/util/nanotool/sensorevent.cpp
+++ b/util/nanotool/sensorevent.cpp
@@ -24,7 +24,9 @@
 
 namespace android {
 
-constexpr float kCompressedSampleRatio(8.0f * 9.81f / 32768.0f);
+constexpr float kCompressedAccelSampleRatio(8.0f * 9.81f / 32768.0f);
+constexpr float kCompressedMagSampleRatio(0.15f); //For AK09915
+//constexpr float kCompressedMagSampleRatio(0.0625f); //For BMM150
 
 /* SensorEvent ****************************************************************/
 
@@ -81,6 +83,7 @@ std::unique_ptr<SensorEvent> SensorEvent::FromBytes(
           break;
 
       case SensorType::CompressedAccel:
+      case SensorType::CompressedMag:
           sensor_event = new CompressedTripleAxisSensorEvent();
           break;
 
@@ -259,6 +262,7 @@ uint8_t TripleAxisSensorEvent::GetSampleDataSize() const {
 
 std::string CompressedTripleAxisSensorEvent::StringForSample(
         uint8_t index) const {
+    float compressedSampleRatio;
     const CompressedTripleAxisDataPoint *sample =
         reinterpret_cast<const CompressedTripleAxisDataPoint *>(
             GetSampleAtIndex(index));
@@ -269,9 +273,22 @@ std::string CompressedTripleAxisSensorEvent::StringForSample(
     bool is_bias_sample = first_sample->biasPresent
         && first_sample->biasSample == index;
 
-    float x = sample->ix * kCompressedSampleRatio;
-    float y = sample->iy * kCompressedSampleRatio;
-    float z = sample->iz * kCompressedSampleRatio;
+    switch(GetSensorType())
+    {
+        case SensorType::CompressedAccel:
+            compressedSampleRatio = kCompressedAccelSampleRatio;
+            break;
+        case SensorType::CompressedMag:
+            compressedSampleRatio = kCompressedMagSampleRatio;
+            break;
+        default:
+            LOGW("Unsupported compressed sensor type");
+            compressedSampleRatio = 1.0;
+    }
+
+    float x = sample->ix * compressedSampleRatio;
+    float y = sample->iy * compressedSampleRatio;
+    float z = sample->iz * compressedSampleRatio;
 
     char buffer[128];
     snprintf(buffer, sizeof(buffer), "  X:%f Y:%f Z:%f @ %s%s\n",