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

Commit 4b643229 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 7311204 from ab74641c to sc-release 

Change-Id: I0055d110de0fe409c623634573aba8ea134e89b6
parents afa3126b ab74641c

media/libstagefright/foundation/MediaDefs.cpp

+2 −0
Original line number Diff line number Diff line
@@ -58,6 +58,8 @@ const char *MEDIA_MIMETYPE_AUDIO_AC3 = "audio/ac3"; 
const char *MEDIA_MIMETYPE_AUDIO_EAC3 = "audio/eac3";

const char *MEDIA_MIMETYPE_AUDIO_EAC3_JOC = "audio/eac3-joc";

const char *MEDIA_MIMETYPE_AUDIO_AC4 = "audio/ac4";

const char *MEDIA_MIMETYPE_AUDIO_MPEGH_MHA1 = "audio/mha1";

const char *MEDIA_MIMETYPE_AUDIO_MPEGH_MHM1 = "audio/mhm1";

const char *MEDIA_MIMETYPE_AUDIO_SCRAMBLED = "audio/scrambled";

const char *MEDIA_MIMETYPE_AUDIO_ALAC = "audio/alac";

const char *MEDIA_MIMETYPE_AUDIO_WMA = "audio/x-ms-wma";

media/libstagefright/foundation/include/media/stagefright/foundation/MediaDefs.h

+2 −0
Original line number Diff line number Diff line
@@ -60,6 +60,8 @@ extern const char *MEDIA_MIMETYPE_AUDIO_AC3; 
extern const char *MEDIA_MIMETYPE_AUDIO_EAC3;

extern const char *MEDIA_MIMETYPE_AUDIO_EAC3_JOC;

extern const char *MEDIA_MIMETYPE_AUDIO_AC4;

extern const char *MEDIA_MIMETYPE_AUDIO_MPEGH_MHA1;

extern const char *MEDIA_MIMETYPE_AUDIO_MPEGH_MHM1;

extern const char *MEDIA_MIMETYPE_AUDIO_SCRAMBLED;

extern const char *MEDIA_MIMETYPE_AUDIO_ALAC;

extern const char *MEDIA_MIMETYPE_AUDIO_WMA;

services/camera/libcameraservice/CameraService.cpp

+5 −0
Original line number Diff line number Diff line
@@ -2724,6 +2724,11 @@ void CameraService::playSound(sound_kind kind) { 
    ATRACE_CALL();



    LOG1("playSound(%d)", kind);

    if (kind < 0 || kind >= NUM_SOUNDS) {

        ALOGE("%s: Invalid sound id requested: %d", __FUNCTION__, kind);

        return;

    }



    Mutex::Autolock lock(mSoundLock);

    loadSoundLocked(kind);

    sp<MediaPlayer> player = mSoundPlayer[kind];

services/mediametrics/statsd_drm.cpp

+8 −1
Original line number Diff line number Diff line
@@ -59,9 +59,16 @@ bool statsd_mediadrm(const std::shared_ptr<const mediametrics::Item>& item, 
    std::string description;

    (void) item->getString("description", &description);



    std::string serialized_metrics;

    (void) item->getString("serialized_metrics", &serialized_metrics);

    if (serialized_metrics.empty()) {

        ALOGD("statsd_mediadrm skipping empty entry");

        return false;

    }



    // This field is left here for backward compatibility.

    // This field is not used anymore.

    const std::string  kUnusedField("unused");

    const std::string  kUnusedField("");

    android::util::BytesField bf_serialized(kUnusedField.c_str(), kUnusedField.size());

    int result = android::util::stats_write(android::util::MEDIAMETRICS_MEDIADRM_REPORTED,

        timestamp_nanos, package_name.c_str(), package_version_code,