| commit | 2efb00455a92fe65233b3e57474504cc0137d9cc | [log] [tgz] |
|---|---|---|
| author | Christopher Di Bella <cjdb@google.com> | Mon Mar 01 09:05:05 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Mar 01 09:05:05 2021 +0000 |
| tree | ecccf55f5ec04e9182e02ca65d5edd1b205ae3e8 | |
| parent | 4ab617108d196b251b73b6273b383ef971f5ab4e [diff] | |
| parent | aaa9c6f386d3abc195bee9936fc9e64dd3b8f6c7 [diff] |
Merge "follows the advice of -Wsign-compare" am: 06ea5f150a am: 300005809b am: d26260bff2 am: aaa9c6f386 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1606916 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ifd76be473950de5df19971bf7433bdaed86c696a
diff --git a/bluetooth/audio/2.0/default/BluetoothAudioProvidersFactory.cpp b/bluetooth/audio/2.0/default/BluetoothAudioProvidersFactory.cpp index df89cc8..0e5b7e4 100644 --- a/bluetooth/audio/2.0/default/BluetoothAudioProvidersFactory.cpp +++ b/bluetooth/audio/2.0/default/BluetoothAudioProvidersFactory.cpp
@@ -75,7 +75,7 @@ android::bluetooth::audio::GetOffloadCodecCapabilities(sessionType); if (db_codec_capabilities.size()) { audio_capabilities.resize(db_codec_capabilities.size()); - for (int i = 0; i < db_codec_capabilities.size(); ++i) { + for (std::size_t i = 0; i < db_codec_capabilities.size(); ++i) { audio_capabilities[i].codecCapabilities(db_codec_capabilities[i]); } }
diff --git a/identity/support/src/IdentityCredentialSupport.cpp b/identity/support/src/IdentityCredentialSupport.cpp index 6418028..aba89c1 100644 --- a/identity/support/src/IdentityCredentialSupport.cpp +++ b/identity/support/src/IdentityCredentialSupport.cpp
@@ -928,7 +928,7 @@ // translate certificate format from keymaster_cert_chain_t to vector<vector<uint8_t>>. vector<vector<uint8_t>> attestationCertificate; - for (int i = 0; i < cert_chain_out.entry_count; i++) { + for (std::size_t i = 0; i < cert_chain_out.entry_count; i++) { attestationCertificate.insert( attestationCertificate.end(), vector<uint8_t>(