diff options
author | Christopher Ferris <cferris@google.com> | 2022-08-16 01:43:31 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-08-16 01:43:31 +0000 |
commit | 80b3183143d24021b29f7afd147b55625f39a2ef (patch) | |
tree | e9ea5c0d94d3e557c9dc9b89445dab7038a2d3cf | |
parent | dacabf034e5d7b3ae825bd1f3ad83f85b35bd7ad (diff) | |
parent | c532332a09662b797f49b52c1c9f9cc6f329d97b (diff) | |
download | tinycompress-aml_cfg_341510000.tar.gz |
Merge "compress: fix return value of is_codec_supported" am: 53414059ef am: 6b6d429d1d am: 786c188d00 am: d7ff18e034 am: c532332a09HEADandroid-wear-14.0.0-gpl_r1android-14.0.0_r45android-14.0.0_r44android-14.0.0_r43android-14.0.0_r42android-14.0.0_r41android-14.0.0_r40android-14.0.0_r39android-14.0.0_r38android-14.0.0_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16aml_rkp_341510000aml_rkp_341311000aml_rkp_341114000aml_rkp_341015010aml_rkp_341012000aml_hef_341717050aml_hef_341613000aml_hef_341512030aml_hef_341415040aml_hef_341311010aml_hef_341114030aml_cfg_341510000mastermainandroid14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-releaseandroid14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-mainline-healthfitness-releaseandroid14-devandroid14-d2-s5-releaseandroid14-d2-s4-releaseandroid14-d2-s3-releaseandroid14-d2-s2-releaseandroid14-d2-s1-releaseandroid14-d2-release
Original change: https://android-review.googlesource.com/c/platform/external/tinycompress/+/2167162
Change-Id: Iac50c4aacc7f20d2fdd0b7cd15204dff04873b57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | compress.c | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -574,9 +574,11 @@ bool is_codec_supported(unsigned int card, unsigned int device, ops = &compr_hw_ops; fd = ops->open(card, device, flags, &data, NULL); - if (fd < 0) - return oops(&bad_compress, errno, "cannot open card %u, device %u", + if (fd < 0) { + oops(&bad_compress, errno, "cannot open card %u, device %u", card, device); + return false; + } ret = _is_codec_type_supported(ops, data, codec); |