| commit | 300005809b71f8345b8b1174b99bccf7aeb9a85f | [log] [tgz] |
|---|---|---|
| author | Christopher Di Bella <cjdb@google.com> | Fri Feb 26 23:32:52 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Feb 26 23:32:52 2021 +0000 |
| tree | 11817b851511bd5196ad830617d1e4a1422ae69c | |
| parent | a9c30d17edf4141d6c9b57295c1a79edf05b8ee1 [diff] | |
| parent | 06ea5f150ad1360acbf2e9430de76ccc03f0f3d3 [diff] |
Merge "follows the advice of -Wsign-compare" am: 06ea5f150a Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1606916 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1e04ec3fd24d2efaad0db57e15f671bd001363a6
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>(