commit be3d40cadb8490291512a6d7882791dda9104316
author Emilian Peev <epeev@google.com> Mon Mar 27 13:03:10 2017 +0100
committer Emilian Peev <epeev@google.com> Tue Mar 28 08:16:44 2017 +0000
tree 361ccc398028c2279cdb19025b533028d8be1ccb
parent 5f8beee0ea76ffe5cc40a517e8db43dbd64fbeff

Camera: Update 'indexOfKey' return check

Method 'indexOfKey' will return 'NAME_NOT_FOUND' error
status in case it doesn't find any values matching the
given key. Checking for anything other than this error
code could lead to instabilities.

Bug: 35925482
Test: Manual using application
Change-Id: Ie72eb29776b27a6d485f6e42ee7e62c62795ca9e
(cherry picked from commit 4219c290e526c6cb1767038776fff4f9b5d74cc7)

services/camera/libcameraservice/device3/Camera3Device.cpp

diff --git a/services/camera/libcameraservice/device3/Camera3Device.cpp b/services/camera/libcameraservice/device3/Camera3Device.cpp
index eccaddb..1de2edc 100644
--- a/services/camera/libcameraservice/device3/Camera3Device.cpp
+++ b/services/camera/libcameraservice/device3/Camera3Device.cpp
@@ -967,7 +967,7 @@
         const StreamBuffer &bSrc = result.outputBuffers[i];
 
         ssize_t idx = mOutputStreams.indexOfKey(bSrc.streamId);
-        if (idx == -1) {
+        if (idx == NAME_NOT_FOUND) {
             ALOGE("%s: Frame %d: Buffer %zu: Invalid output stream id %d",
                     __FUNCTION__, result.frameNumber, i, bSrc.streamId);
             return;
@@ -1053,7 +1053,7 @@
             m.message.error.frame_number = msg.msg.error.frameNumber;
             if (msg.msg.error.errorStreamId >= 0) {
                 ssize_t idx = mOutputStreams.indexOfKey(msg.msg.error.errorStreamId);
-                if (idx == -1) {
+                if (idx == NAME_NOT_FOUND) {
                     ALOGE("%s: Frame %d: Invalid error stream id %d",
                             __FUNCTION__, m.message.error.frame_number, msg.msg.error.errorStreamId);
                     return;