commit 972576e7a869d3046318e89da2e6ec57cc7c415f
author Pawin Vongmasa <pawin@google.com> Tue Aug 07 18:25:22 2018 -0700
committer Pawin Vongmasa <pawin@google.com> Tue Aug 07 18:25:22 2018 -0700
tree a779ca38721f2dbc3311782ceaa3fd2a1ac87344
parent 2dd0ac778b0fb56deb5850371b5f52bd3296cadb

Use the null check properly

Test: m cts && cts-tradefed run cts -m CtsMediaTestCases \
-t android.media.cts.DecoderTest

Bug: 112129800
Change-Id: I27aaf933fbb1e99c0c7310d704d0bceac24b4d1e

codec2/hidl/client/client.cpp

diff --git a/codec2/hidl/client/client.cpp b/codec2/hidl/client/client.cpp
index 9a82712..a0340a6 100644
--- a/codec2/hidl/client/client.cpp
+++ b/codec2/hidl/client/client.cpp
@@ -189,9 +189,10 @@
                             continue;
                         }
                         if (!heapParams) {
-                            ALOGW("query -- extra stack param.");
+                            ALOGW("query -- unexpected extra stack param.");
+                        } else {
+                            heapParams->emplace_back(C2Param::Copy(*paramPointer));
                         }
-                        heapParams->emplace_back(C2Param::Copy(*paramPointer));
                     }
                     ++it;
                 }