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

Unverified Commit 26a64fbe authored by Kevin F. Haggerty's avatar Kevin F. Haggerty
Browse files

Merge tag 'android-11.0.0_r32' into staging/lineage-18.1_merge-android-11.0.0_r32 

Android 11.0.0 Release 32 (RQ2A.210305.006)

* tag 'android-11.0.0_r32':
  Log MediaExtractor entry point to MediaMetrics
  Avoid storing 'this' in a wp<AudioEffect> while in constructor
  Camera: Remove app segment stream's locked buffer tracking
  IAudioPolicyService, IAudioFlinger: check C structs on server side
  CCodecConfig: don't dup input format
  OMX AAC decode don't support getting DRC parameters
  mp3dec: Fix out of bound read error
  aaudio: use strong pointer to protect callback
  Camera: Document behavior when cropRegion and zoomRation conflict
  MediaCodec: fix possible crash at stop & error
  ToneGenerator: add special ringback tone for Taiwan.
  MediaCodec: clean up resources pending removal at init
  CCodec: limit # of active slots instead of # of client buffers
  CCodec: add to check pipelineFull() in feedInputBufferIfAvailableInternal()
  Fix potential overflow in WAV extractor
  Fix potential overflow in WAV extractor
  Fix potential overflow in WAV extractor
  Pass MediaParser metrics to statsd
  Allow MediaMetrics entries from MediaParser
  stagefright: add test for MediaCodec::reclaim/release race
  MediaCodec: ensure reply does not get lost
  Revert "mp3dec: Fix out of bound read error"
  Check for disabled camera in MediaRecorderClient
  libcamera_client: Add utils function isCameraServiceDisabled.
  audio policy manager: fix BT SCO stream mute
  Fix memory overflow in ESQueue
  MediaCodec: propagate usage from original surface to release surface
  Camera: Support for metadata buffer size queries
  Build static and shared libdrmframeworkcommon.
  Fix memory leak and abort
  Move an orphaned analytics reference under a mutex
  m4v_h263: Fix heap buffer overflow issue in BitstreamFillCache
  mp3dec: Fix out of bound read error

Change-Id: I56bca077aee8cf3d3ecbbb79f2d1b627e907541c
parents da856375 72127d72

apex/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ apex_defaults { 
                "libmpeg2extractor",

                "liboggextractor",

                "libwavextractor",

                // JNI

                "libmediaparser-jni"

            ],

        },

    },

camera/CameraBase.cpp

+2 −3
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <binder/IMemory.h>



#include <camera/CameraBase.h>

#include <camera/CameraUtils.h>



// needed to instantiate

#include <camera/Camera.h>
@@ -124,9 +125,7 @@ const sp<::android::hardware::ICameraService> CameraBase<TCam, TCamTraits>::getC 
{

    Mutex::Autolock _l(gLock);

    if (gCameraService.get() == 0) {

        char value[PROPERTY_VALUE_MAX];

        property_get("config.disable_cameraservice", value, "0");

        if (strncmp(value, "0", 2) != 0 && strncasecmp(value, "false", 6) != 0) {

        if (CameraUtils::isCameraServiceDisabled()) {

            return gCameraService;

        }

camera/CameraMetadata.cpp

+5 −0
Original line number Diff line number Diff line
@@ -169,6 +169,11 @@ bool CameraMetadata::isEmpty() const { 
    return entryCount() == 0;

}



size_t CameraMetadata::bufferSize() const {

    return (mBuffer == NULL) ? 0 :

            get_camera_metadata_size(mBuffer);

}



status_t CameraMetadata::sort() {

    if (mLocked) {

        ALOGE("%s: CameraMetadata is locked", __FUNCTION__);

camera/CameraUtils.cpp

+7 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <system/window.h>

#include <system/graphics.h>



#include <cutils/properties.h>

#include <utils/Log.h>



namespace android {
@@ -122,4 +123,10 @@ status_t CameraUtils::getRotationTransform(const CameraMetadata& staticInfo, 
    return OK;

}



bool CameraUtils::isCameraServiceDisabled() {

    char value[PROPERTY_VALUE_MAX];

    property_get("config.disable_cameraservice", value, "0");

    return (strncmp(value, "0", 2) != 0 && strncasecmp(value, "false", 6) != 0);

}



} /* namespace android */

camera/include/camera/CameraMetadata.h

+5 −0
Original line number Diff line number Diff line
@@ -127,6 +127,11 @@ class CameraMetadata: public Parcelable { 
     */

    bool isEmpty() const;



    /**

     * Return the allocated camera metadata buffer size in bytes.

     */

    size_t bufferSize() const;



    /**

     * Sort metadata buffer for faster find

     */