Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fcfde3ef authored by Andy Hung's avatar Andy Hung Committed by Automerger Merge Worker
Browse files

Merge "MediaMetrics: Fix clang-tidy narrowing warning" am: 7931cbd1 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1999794

Change-Id: I52726fcf80e1a30efb3d727b87b7c096506fbb7a
parents 1f2608e3 7931cbd1

services/mediametrics/AudioAnalytics.cpp

+2 −2
Original line number Diff line number Diff line
@@ -1056,10 +1056,10 @@ void AudioAnalytics::AAudioStreamInfo::endAAudioStream( 
        if (channelMask != 0) {

            switch (direction) {

                case 1: // Output, keep sync with AudioTypes#getAAudioDirection()

                    channelCount = audio_channel_count_from_out_mask(channelMask);

                    channelCount = (int32_t)audio_channel_count_from_out_mask(channelMask);

                    break;

                case 2: // Input, keep sync with AudioTypes#getAAudioDirection()

                    channelCount = audio_channel_count_from_in_mask(channelMask);

                    channelCount = (int32_t)audio_channel_count_from_in_mask(channelMask);

                    break;

                default:

                    ALOGW("Invalid direction %d", direction);

services/mediametrics/statsd_drm.cpp

+1 −1
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ std::vector<uint8_t> base64DecodeNoPad(std::string& str) { 
    std::vector<uint8_t> buf(str.length() / 4 * 3, 0);

    size_t size = buf.size();

    if (decodeBase64(buf.data(), &size, str.c_str()) && size <= buf.size()) {

        buf.erase(buf.begin() + size, buf.end());

        buf.erase(buf.begin() + (ptrdiff_t)size, buf.end());

        return buf;

    }

    return {};