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

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

Snap for 6456462 from b1a8fe0e to mainline-release 

Change-Id: I377a6ff44334dc442921e2c32ae7e1d7cd97e9a8
parents 814bc366 b1a8fe0e

camera/cameraserver/cameraserver.rc

+1 −1
Original line number Diff line number Diff line
@@ -3,5 +3,5 @@ service cameraserver /system/bin/cameraserver 
    user cameraserver

    group audio camera input drmrpc

    ioprio rt 4

    writepid /dev/cpuset/camera-daemon/tasks /dev/stune/top-app/tasks

    task_profiles CameraServiceCapacity MaxPerformance

    rlimit rtprio 10 10

include/private/media/AudioTrackShared.h

+2 −0
Original line number Diff line number Diff line
@@ -614,6 +614,8 @@ public: 
    // and thus which resulted in an underrun.

    virtual uint32_t    getUnderrunFrames() const { return mCblk->u.mStreaming.mUnderrunFrames; }



    virtual uint32_t    getUnderrunCount() const { return mCblk->u.mStreaming.mUnderrunCount; }



    // Return the playback speed and pitch read atomically. Not multi-thread safe on server side.

    AudioPlaybackRate getPlaybackRate();

media/audioserver/audioserver.rc

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ service audioserver /system/bin/audioserver 
    group audio camera drmrpc media mediadrm net_bt net_bt_admin net_bw_acct wakelock

    capabilities BLOCK_SUSPEND

    ioprio rt 4

    writepid /dev/cpuset/foreground/tasks /dev/stune/foreground/tasks

    task_profiles ProcessCapacityHigh HighPerformance



    onrestart setprop sys.audio.restart.hal 1

media/bufferpool/2.0/Accessor.cpp

+4 −0
Original line number Diff line number Diff line
@@ -117,6 +117,10 @@ void Accessor::createInvalidator() { 
    Accessor::Impl::createInvalidator();

}



void Accessor::createEvictor() {

    Accessor::Impl::createEvictor();

}



// Methods from ::android::hardware::media::bufferpool::V2_0::IAccessor follow.

Return<void> Accessor::connect(

        const sp<::android::hardware::media::bufferpool::V2_0::IObserver>& observer,

media/bufferpool/2.0/Accessor.h

+2 −0
Original line number Diff line number Diff line
@@ -187,6 +187,8 @@ struct Accessor : public IAccessor { 


    static void createInvalidator();



    static void createEvictor();



private:

    class Impl;

    std::shared_ptr<Impl> mImpl;