commit 0b4c628e621e54063a3e10e752aadf0601388852
author Andrew Rossignol <aarossig@google.com> Mon May 23 21:08:41 2016 -0700
committer Andrew Rossignol <aarossig@google.com> Tue May 24 23:04:19 2016 +0000
tree 6e123cedaa0a0ef765bed7043c4a6d644179d1e1
parent 1b83b5bf9963689b135d4587f6e86786d112ea02

nanotool: only disable sensors that actually exist

This prevents sending disable commands for sensors who do not have an
assigned value.

Change-Id: I785871d535435df8f1d9f88d9783c387b3ed088e

util/nanotool/contexthub.cpp

diff --git a/util/nanotool/contexthub.cpp b/util/nanotool/contexthub.cpp
index 69bf90a..5beed5e 100644
--- a/util/nanotool/contexthub.cpp
+++ b/util/nanotool/contexthub.cpp
@@ -238,10 +238,8 @@
 bool ContextHub::DisableAllSensors() {
     bool success = true;
 
-    for (int sensor_type = static_cast<int>(SensorType::Invalid_) + 1;
-            sensor_type < static_cast<int>(SensorType::Max_);
-            ++sensor_type) {
-        success &= DisableSensor(static_cast<SensorType>(sensor_type));
+    for (size_t i = 0; i < ARRAY_LEN(sensor_names_); i++) {
+        success &= DisableSensor(sensor_names_[i].sensor_type);
     }
 
     return success;
@@ -251,11 +249,9 @@
     bool success = true;
 
     LOGD("Disabling all active sensors");
-    for (int sensor_type = static_cast<int>(SensorType::Invalid_) + 1;
-            sensor_type < static_cast<int>(SensorType::Max_);
-            ++sensor_type) {
-        if (sensor_is_active_[sensor_type]) {
-            success &= DisableSensor(static_cast<SensorType>(sensor_type));
+    for (size_t i = 0; i < ARRAY_LEN(sensor_names_); i++) {
+        if (sensor_is_active_[static_cast<int>(sensor_names_[i].sensor_type)]) {
+            success &= DisableSensor(sensor_names_[i].sensor_type);
         }
     }