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

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

Snap for 6440900 from 31e5b479 to rvc-release 

Change-Id: I325ec42841c23a7637e634d2338e98b94690fb5d
parents 253f7249 31e5b479

drm/mediadrm/plugins/clearkey/hidl/DrmFactory.cpp

+13 −0
Original line number Diff line number Diff line
@@ -91,6 +91,19 @@ Return<void> DrmFactory::getSupportedCryptoSchemes( 
    return Void();

}



Return<void> DrmFactory::debug(const hidl_handle& fd, const hidl_vec<hidl_string>& /*args*/) {

    if (fd.getNativeHandle() == nullptr || fd->numFds < 1) {

        ALOGE("%s: missing fd for writing", __FUNCTION__);

        return Void();

    }



    FILE* out = fdopen(dup(fd->data[0]), "w");

    uint32_t currentSessions = SessionLibrary::get()->numOpenSessions();

    fprintf(out, "current open sessions: %u\n", currentSessions);

    fclose(out);

    return Void();

}



} // namespace clearkey

} // namespace V1_3

} // namespace drm

drm/mediadrm/plugins/clearkey/hidl/include/DrmFactory.h

+3 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ namespace clearkey { 


using ::android::hardware::drm::V1_1::SecurityLevel;

using ::android::hardware::hidl_array;

using ::android::hardware::hidl_handle;

using ::android::hardware::hidl_string;

using ::android::hardware::Return;
@@ -55,6 +56,8 @@ struct DrmFactory : public IDrmFactory { 
    Return<void> getSupportedCryptoSchemes(

            getSupportedCryptoSchemes_cb _hidl_cb) override;



    Return<void> debug(const hidl_handle& fd, const hidl_vec<hidl_string>& args);



private:

    CLEARKEY_DISALLOW_COPY_AND_ASSIGN(DrmFactory);

};

media/libmediametrics/include/MediaMetricsConstants.h

+1 −0
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ 
// of suppressed in the Time Machine.

#define AMEDIAMETRICS_PROP_SUFFIX_CHAR_DUPLICATES_ALLOWED '#'



#define AMEDIAMETRICS_PROP_ALLOWUID       "_allowUid"      // int32_t, allow client uid to post

#define AMEDIAMETRICS_PROP_AUXEFFECTID    "auxEffectId"    // int32 (AudioTrack)

#define AMEDIAMETRICS_PROP_BUFFERSIZEFRAMES "bufferSizeFrames" // int32

#define AMEDIAMETRICS_PROP_BUFFERCAPACITYFRAMES "bufferCapacityFrames" // int32

services/audioflinger/FastThread.cpp

+2 −2
Original line number Diff line number Diff line
@@ -309,7 +309,7 @@ bool FastThread::threadLoop() 
                    // compute the delta value of clock_gettime(CLOCK_MONOTONIC)

                    uint32_t monotonicNs = nsec;

                    if (sec > 0 && sec < 4) {

                        monotonicNs += sec * 1000000000;

                        monotonicNs += sec * 1000000000U; // unsigned to prevent signed overflow.

                    }

                    // compute raw CPU load = delta value of clock_gettime(CLOCK_THREAD_CPUTIME_ID)

                    uint32_t loadNs = 0;
@@ -325,7 +325,7 @@ bool FastThread::threadLoop() 
                            }

                            loadNs = nsec;

                            if (sec > 0 && sec < 4) {

                                loadNs += sec * 1000000000;

                                loadNs += sec * 1000000000U; // unsigned to prevent signed overflow.

                            }

                        } else {

                            // first time through the loop

services/audioflinger/Tracks.cpp

+2 −0
Original line number Diff line number Diff line
@@ -605,6 +605,7 @@ AudioFlinger::PlaybackThread::Track::Track( 
    mediametrics::LogItem(mMetricsId)

        .setPid(creatorPid)

        .setUid(uid)

        .set(AMEDIAMETRICS_PROP_ALLOWUID, (int32_t)uid)

        .set(AMEDIAMETRICS_PROP_EVENT,

                AMEDIAMETRICS_PROP_PREFIX_SERVER AMEDIAMETRICS_PROP_EVENT_VALUE_CTOR)

        .record();
@@ -2165,6 +2166,7 @@ AudioFlinger::RecordThread::RecordTrack::RecordTrack( 
    mediametrics::LogItem(mMetricsId)

        .setPid(creatorPid)

        .setUid(uid)

        .set(AMEDIAMETRICS_PROP_ALLOWUID, (int32_t)uid)

        .set(AMEDIAMETRICS_PROP_EVENT, "server." AMEDIAMETRICS_PROP_EVENT_VALUE_CTOR)

        .record();

}