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

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

Snap for 8624184 from 448ae113 to tm-release 

Change-Id: Ice6da5d2f6887e72a0f5812e7f86efc28c9956cf
parents c59f41c7 448ae113

drm/libmediadrm/CryptoHalAidl.cpp

+5 −0
Original line number Diff line number Diff line
@@ -219,6 +219,7 @@ status_t CryptoHalAidl::destroyPlugin() { 
    }



    mPlugin.reset();

    mInitCheck = NO_INIT;

    return OK;

}
@@ -372,6 +373,10 @@ int32_t CryptoHalAidl::setHeap(const sp<HidlMemory>& heap) { 


    Mutex::Autolock autoLock(mLock);



    if (mInitCheck != OK) {

        return -1;

    }



    int32_t seqNum = mHeapSeqNum++;

    uint32_t bufferId = static_cast<uint32_t>(seqNum);

    mHeapSizes.add(seqNum, heap->size());

drm/libmediadrm/CryptoHalHidl.cpp

+5 −0
Original line number Diff line number Diff line
@@ -190,6 +190,7 @@ status_t CryptoHalHidl::destroyPlugin() { 


    mPlugin.clear();

    mPluginV1_2.clear();

    mInitCheck = NO_INIT;

    return OK;

}
@@ -221,6 +222,10 @@ int32_t CryptoHalHidl::setHeapBase(const sp<HidlMemory>& heap) { 


    Mutex::Autolock autoLock(mLock);



    if (mInitCheck != OK) {

        return -1;

    }



    int32_t seqNum = mHeapSeqNum++;

    uint32_t bufferId = static_cast<uint32_t>(seqNum);

    mHeapSizes.add(seqNum, heap->size());

media/libmediametrics/MediaMetricsItem.cpp

+3 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <unordered_map>



#include <binder/Parcel.h>

#include <cutils/multiuser.h>

#include <cutils/properties.h>

#include <utils/Errors.h>

#include <utils/Log.h>
@@ -343,7 +344,8 @@ bool BaseItem::isEnabled() { 
        // now.

        // TODO(b/190151205): Either allow the HotwordDetectionService to access MediaMetrics or

        // make this disabling specific to that process.

        if (uid >= AID_ISOLATED_START && uid <= AID_ISOLATED_END) {

        uid_t appid = multiuser_get_app_id(uid);

        if (appid >= AID_ISOLATED_START && appid <= AID_ISOLATED_END) {

            return false;

        }

        break;