commit | 5c2b4ccf4742a71be5842ee6afd9d74d0892bf9e | [log] [tgz] |
---|---|---|
author | gitbuildkicker <android-build@google.com> | Mon Jan 22 22:26:21 2018 -0800 |
committer | gitbuildkicker <android-build@google.com> | Mon Jan 22 22:26:21 2018 -0800 |
tree | b5ae40a75e056d5e6eeacee9a5e442b65b477bb1 | |
parent | e2b9f5ead52a5c5332ef1e568b4704ee71b064b8 [diff] | |
parent | cb5133fffae073da228d1e1b3e6e755cf2062f52 [diff] |
merge in pi-release history after reset to master
diff --git a/msm8998/hal/src/HAL.cpp b/msm8998/hal/src/HAL.cpp index e19a149..11dd26d 100644 --- a/msm8998/hal/src/HAL.cpp +++ b/msm8998/hal/src/HAL.cpp
@@ -611,9 +611,11 @@ Return<void> HAL::debug ( - const hidl_handle& fd, + const hidl_handle& handle, const hidl_vec<hidl_string>& /* options */ ) { - mLogs.toFd(fd->data[0]); + if (handle != nullptr && handle->numFds >= 1) { + mLogs.toFd(handle->data[0]); + } return Void(); } /* debug */