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

Commit 23067aca authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 12937884 from 20a031fc to 25Q2-release 

Change-Id: I7770f62f374bf1dea2aedf3b799c29b9606b4eb9
parents 4a9e8a97 20a031fc

camera/camera2/OutputConfiguration.cpp

+1 −1
Original line number Diff line number Diff line
@@ -347,7 +347,7 @@ status_t OutputConfiguration::readFromParcel(const android::Parcel* parcel) { 
        IF_ALOGV() {

            uint64_t bufferID;

            surface.getUniqueId(&bufferID);

            ALOGV("%s: OutputConfiguration: %lu, name %s", __FUNCTION__,

            ALOGV("%s: OutputConfiguration: %" PRIu64 ", name %s", __FUNCTION__,

                    bufferID, toString8(surface.name).c_str());

        }

#else

media/audio/aconfig/audioserver.aconfig

+8 −0
Original line number Diff line number Diff line
@@ -35,6 +35,14 @@ flag { 
    bug: "306283018"

}



flag {

    name: "fix_aaudio_stream_reopen_in_libaudiohal_aidl"

    namespace: "media_audio"

    description:

        "Support reopening of AAudio streams in the libaudiohal@aidl layer"

    bug: "274456992"

}



flag {

    name: "fix_call_audio_patch"

    namespace: "media_audio"

services/tuner/TunerHelper.cpp

+2 −2
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ void TunerHelper::updateTunerResources(const vector<TunerFrontendInfo>& feInfos, 
}



// TODO: create a map between resource id and handles.

int TunerHelper::getResourceIdFromHandle(long resourceHandle, int /*type*/) {

int TunerHelper::getResourceIdFromHandle(int64_t resourceHandle, int /*type*/) {

    return (int)((resourceHandle >> RESOURCE_ID_SHIFT) & RESOURCE_ID_MASK);

}
@@ -112,7 +112,7 @@ int TunerHelper::getResourceIdFromHandle(long resourceHandle, int /*type*/) { 
 *   32 bits - id

 *   24 bits - resourceRequestCount

 */

long TunerHelper::getResourceHandleFromId(int id, int resourceType) {

int64_t TunerHelper::getResourceHandleFromId(int id, int resourceType) {

    // TODO: build up randomly generated id to handle mapping

    return static_cast<int64_t>(resourceType & RESOURCE_TYPE_MASK) << RESOURCE_TYPE_SHIFT |

           static_cast<int64_t>(id & RESOURCE_ID_MASK) << RESOURCE_ID_SHIFT |

services/tuner/TunerHelper.h

+2 −2
Original line number Diff line number Diff line
@@ -62,8 +62,8 @@ public: 
                                     const vector<TunerDemuxInfo>& demuxInfos,

                                     const vector<int64_t>& lnbHandles);

    // TODO: create a map between resource id and handles.

    static int getResourceIdFromHandle(long resourceHandle, int type);

    static long getResourceHandleFromId(int id, int resourceType);

    static int getResourceIdFromHandle(int64_t resourceHandle, int type);

    static int64_t getResourceHandleFromId(int id, int resourceType);



private:

    static int32_t sResourceRequestCount;