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

2011-08-11 18:26:11 -07:00
parent c88ba95921 063097545e
commit 61bb11cfa0
1 changed files with 2 additions and 1 deletions
--- 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;
 }