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

Commit 609babb1 authored by Chih-Hung Hsieh's avatar Chih-Hung Hsieh Committed by android-build-merger
Browse files

resolve merge conflicts of 5c4fbd28 to oc-mr1-dev-plus-aosp 

am: 9c59bc9c

Change-Id: I2674d0e4b49082d9d068575ce1c5e7b53a5ea01e
parents 63ca9630 9c59bc9c

media/libaaudio/examples/utils/AAudioExampleUtils.h

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#define NANOS_PER_MILLISECOND (NANOS_PER_MICROSECOND * 1000)

#define NANOS_PER_SECOND      (NANOS_PER_MILLISECOND * 1000)



template <class T = aaudio_sharing_mode_t>

const char *getSharingModeText(aaudio_sharing_mode_t mode) {

    const char *text = "unknown";

    switch (mode) {