commit 68a593e7fa07c947fef2c5de53c42e14ed630a8a
author Chih-Hung Hsieh <chh@google.com> Thu Apr 28 09:14:32 2016 -0700
committer Chih-Hung Hsieh <chh@google.com> Thu Apr 28 09:14:32 2016 -0700
tree 6ae7a67ecfddd080d915a6a3de6f98bfe54a33c4
parent 53925d208ade2f844f018ed2ca0fb042ce7db85d
parent 168dc86c261bd7770b99b1803a769eb658f13f96

resolve merge conflicts of 168dc86 to nyc-dev-plus-aosp

Change-Id: I1554cec6ea880a87921f723bc96972cb8e1d3c5c

libs/gui/SensorManager.cpp

diff --git a/libs/gui/SensorManager.cpp b/libs/gui/SensorManager.cpp
index 225bfa8..5338034 100644
--- a/libs/gui/SensorManager.cpp
+++ b/libs/gui/SensorManager.cpp
@@ -139,7 +139,7 @@
                 mSensorManager.sensorManagerDied();
             }
         public:
-            DeathObserver(SensorManager& mgr) : mSensorManager(mgr) { }
+            explicit DeathObserver(SensorManager& mgr) : mSensorManager(mgr) { }
         };
 
         LOG_ALWAYS_FATAL_IF(mSensorServer.get() == NULL, "getService(SensorService) NULL");