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

Commit cad41411 authored by Glenn Kasten's avatar Glenn Kasten Committed by android-build-merger
Browse files

Merge "Fix typos in use of %#" into nyc-dev 

am: 02c4f1c0

* commit '02c4f1c0':
  Fix typos in use of %#
parents e5bd62ba 02c4f1c0

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+3 −3
Original line number Diff line number Diff line
@@ -5212,7 +5212,7 @@ void AudioPolicyManager::filterSurroundFormats(FormatVector &formats) { 
    bool supportsIEC61937 = false;

    for (size_t formatIndex = 0; formatIndex < formats.size(); formatIndex++) {

        audio_format_t format = formats[formatIndex];

        ALOGI("%s: original formats: #%x", __FUNCTION__, format);

        ALOGI("%s: original formats: %#x", __FUNCTION__, format);

        switch (format) {

            case AUDIO_FORMAT_AC3:

            case AUDIO_FORMAT_E_AC3:
@@ -5243,7 +5243,7 @@ void AudioPolicyManager::filterSurroundFormats(FormatVector &formats) { 
                case AUDIO_FORMAT_DTS:

                case AUDIO_FORMAT_DTS_HD:

                case AUDIO_FORMAT_IEC61937:

                    ALOGI("%s: remove #%x", __FUNCTION__, format);

                    ALOGI("%s: remove %#x", __FUNCTION__, format);

                    formats.removeAt(formatIndex);

                    break;

                default:
@@ -5274,7 +5274,7 @@ void AudioPolicyManager::filterSurroundFormats(FormatVector &formats) { 
    // Just for debugging.

    for (size_t formatIndex = 0; formatIndex < formats.size(); formatIndex++) {

        audio_format_t format = formats[formatIndex];

        ALOGI("%s: final formats: #%x", __FUNCTION__, format);

        ALOGI("%s: final formats: %#x", __FUNCTION__, format);

    }

}