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

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

Snap for 12247339 from 972bd022 to 24Q4-release 

Change-Id: Ifdb05e0fbc45aba2fd9ece010daeb66234601b75
parents ebfe27b9 972bd022

drm/mediadrm/plugins/clearkey/aidl/DrmPlugin.cpp

+0 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ const int kKeySetIdLength = 16; 
const int kSecureStopIdStart = 100;

const std::string kOfflineLicense("\"type\":\"persistent-license\"");

const std::string kStreaming("Streaming");

const std::string kTemporaryLicense("\"type\":\"temporary\"");

const std::string kTrue("True");



const std::string kQueryKeyLicenseType("LicenseType");

drm/mediadrm/plugins/clearkey/common/JsonWebKey.cpp

+0 −3
Original line number Diff line number Diff line
@@ -27,10 +27,7 @@ const std::string kKeysTag("keys"); 
const std::string kKeyTypeTag("kty");

const std::string kKeyTag("k");

const std::string kKeyIdTag("kid");

const std::string kMediaSessionType("type");

const std::string kPersistentLicenseSession("persistent-license");

const std::string kSymmetricKeyValue("oct");

const std::string kTemporaryLicenseSession("temporary");

}  // namespace



namespace clearkeydrm {

media/codec2/sfplugin/CCodecBufferChannel.cpp

+0 −1
Original line number Diff line number Diff line
@@ -2807,7 +2807,6 @@ void CCodecBufferChannel::setInfoBuffer(const std::shared_ptr<C2InfoBuffer> &buf 
        work->input.infoBuffers.emplace_back(*buffer);

        work->worklets.emplace_back(new C2Worklet);

        items.push_back(std::move(work));

        c2_status_t err = mComponent->queue(&items);

    }

}

media/utils/ServiceUtilities.cpp

+2 −2
Original line number Diff line number Diff line
@@ -286,7 +286,7 @@ bool modifyAudioRoutingAllowed() { 
bool modifyAudioRoutingAllowed(const AttributionSourceState& attributionSource) {

    uid_t uid = VALUE_OR_FATAL(aidl2legacy_int32_t_uid_t(attributionSource.uid));

    pid_t pid = VALUE_OR_FATAL(aidl2legacy_int32_t_pid_t(attributionSource.pid));

    if (isAudioServerUid(IPCThreadState::self()->getCallingUid())) return true;

    if (isAudioServerUid(uid)) return true;

    // IMPORTANT: Use PermissionCache - not a runtime permission and may not change.

    bool ok = PermissionCache::checkPermission(sModifyAudioRouting, pid, uid);

    if (!ok) ALOGE("%s(): android.permission.MODIFY_AUDIO_ROUTING denied for uid %d",
@@ -301,7 +301,7 @@ bool modifyDefaultAudioEffectsAllowed() { 
bool modifyDefaultAudioEffectsAllowed(const AttributionSourceState& attributionSource) {

    uid_t uid = VALUE_OR_FATAL(aidl2legacy_int32_t_uid_t(attributionSource.uid));

    pid_t pid = VALUE_OR_FATAL(aidl2legacy_int32_t_pid_t(attributionSource.pid));

    if (isAudioServerUid(IPCThreadState::self()->getCallingUid())) return true;

    if (isAudioServerUid(uid)) return true;



    static const String16 sModifyDefaultAudioEffectsAllowed(

            "android.permission.MODIFY_DEFAULT_AUDIO_EFFECTS");

services/camera/libcameraservice/device3/Camera3BufferManager.h

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ public: 
     * by the consumer end point, the BufferQueueProducer callback onBufferReleased will call

     * returnBufferForStream() to return the free buffer to this buffer manager. If the stream

     * uses buffer manager to manage the stream buffers, it should disable the BufferQueue

     * allocation via IGraphicBufferProducer::allowAllocation(false).

     * allocation via Surface::allowAllocation(false).

     *

     * Registering an already registered stream has no effect.

     *