Merge "Ensure outValue is set, even when an error occurs."

1 files changed, 2 insertions, 1 deletions

diff --git a/services/input/EventHub.cpp b/services/input/EventHub.cpp
index 960e4143e659..1d7cc19c02b8 100644
--- a/services/input/EventHub.cpp
+++ b/services/input/EventHub.cpp
@@ -312,6 +312,8 @@ int32_t EventHub::getSwitchState(int32_t deviceId, int32_t sw) const {
 }
 
 status_t EventHub::getAbsoluteAxisValue(int32_t deviceId, int32_t axis, int32_t* outValue) const {
+    *outValue = 0;
+
     if (axis >= 0 && axis <= ABS_MAX) {
         AutoMutex _l(mLock);
 
@@ -328,7 +330,6 @@ status_t EventHub::getAbsoluteAxisValue(int32_t deviceId, int32_t axis, int32_t*
             return OK;
         }
     }
-    *outValue = 0;
     return -1;
 }