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

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

Snap for 7419753 from 69124fa3 to sc-release 

Change-Id: I006cba24346143528a243d2c069efd26bba0ccf9
parents af55dae8 69124fa3

camera/camera2/OutputConfiguration.cpp

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



    std::vector<int32_t> sensorPixelModesUsed;

    if ((err = parcel->readParcelableVector(&sensorPixelModesUsed)) != OK) {

    if ((err = parcel->readInt32Vector(&sensorPixelModesUsed)) != OK) {

        ALOGE("%s: Failed to read sensor pixel mode(s) from parcel", __FUNCTION__);

        return err;

    }

cmds/stagefright/Android.mk

+5 −5
Original line number Diff line number Diff line
@@ -16,9 +16,9 @@ LOCAL_SHARED_LIBRARIES := \ 
        libstagefright_foundation libjpeg libui libgui libcutils liblog \

        libhidlbase libdatasource libaudioclient \

        android.hardware.media.omx@1.0 \

        media_permission-aidl-cpp

        framework-permission-aidl-cpp



LOCAL_STATIC_LIBRARIES := media_permission-aidl-cpp

LOCAL_STATIC_LIBRARIES := framework-permission-aidl-cpp



LOCAL_C_INCLUDES:= \

        frameworks/av/media/libstagefright \
@@ -52,7 +52,7 @@ LOCAL_HEADER_LIBRARIES := \ 
LOCAL_SHARED_LIBRARIES := \

        libstagefright libmedia liblog libutils libbinder \

        libstagefright_foundation libdatasource libaudioclient \

        media_permission-aidl-cpp

        framework-permission-aidl-cpp



LOCAL_C_INCLUDES:= \

        frameworks/av/camera/include \
@@ -90,7 +90,7 @@ LOCAL_C_INCLUDES:= \ 
        frameworks/av/media/libstagefright \

        frameworks/native/include/media/openmax \

        frameworks/native/include/media/hardware \

        media_permission-aidl-cpp

        framework-permission-aidl-cpp



LOCAL_CFLAGS += -Wno-multichar -Werror -Wall
@@ -119,7 +119,7 @@ LOCAL_HEADER_LIBRARIES := \ 
LOCAL_SHARED_LIBRARIES := \

        libstagefright libmedia liblog libutils libbinder \

        libstagefright_foundation libaudioclient \

        media_permission-aidl-cpp

        framework-permission-aidl-cpp



LOCAL_C_INCLUDES:= \

        frameworks/av/media/libstagefright \

cmds/stagefright/audioloop.cpp

+4 −4
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 


#include <utils/String16.h>



#include <android/media/permission/Identity.h>

#include <android/content/AttributionSourceState.h>

#include <binder/ProcessState.h>

#include <media/mediarecorder.h>

#include <media/stagefright/foundation/ADebug.h>
@@ -39,7 +39,7 @@ 


using namespace android;



using media::permission::Identity;

using content::AttributionSourceState;



static void usage(const char* name)

{
@@ -113,10 +113,10 @@ int main(int argc, char* argv[]) 
        audio_attributes_t attr = AUDIO_ATTRIBUTES_INITIALIZER;

        attr.source = AUDIO_SOURCE_MIC;



        // TODO b/182392769: use identity util

        // TODO b/182392769: use attribution source util

        source = new AudioSource(

                &attr,

                Identity(),

                AttributionSourceState(),

                sampleRate,

                channels);

    } else {

media/libaaudio/src/Android.bp

+4 −7
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ cc_library { 
        "libcutils",

        "libutils",

        "libbinder",

        "libpermission",

    ],



    sanitize: {
@@ -86,7 +87,7 @@ cc_library { 
    export_header_lib_headers: ["libaaudio_headers"],



    export_shared_lib_headers: [

        "media_permission-aidl-cpp",

        "framework-permission-aidl-cpp",

    ],



    shared_libs: [
@@ -99,15 +100,11 @@ cc_library { 
        "libcutils",

        "libutils",

        "libbinder",

        "framework-permission-aidl-cpp",

        "aaudio-aidl-cpp",

        "media_permission-aidl-cpp",

        "libaudioclient_aidl_conversion",

    ],



    static_libs: [

        "media_permission-aidl-cpp",

    ],



    cflags: [

        "-Wno-unused-parameter",

        "-Wall",
@@ -177,7 +174,7 @@ aidl_interface { 
    imports: [

        "audio_common-aidl",

        "shared-file-region-aidl",

        "media_permission-aidl",

        "framework-permission-aidl"

    ],

    backend:

    {

media/libaaudio/src/binding/AAudioStreamRequest.cpp

+3 −3
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ using namespace aaudio; 


AAudioStreamRequest::AAudioStreamRequest(const StreamRequest& parcelable) :

        mConfiguration(std::move(parcelable.params)),

        mIdentity(parcelable.identity),

        mAttributionSource(parcelable.attributionSource),

        mSharingModeMatchRequired(parcelable.sharingModeMatchRequired),

        mInService(parcelable.inService) {

}
@@ -39,7 +39,7 @@ AAudioStreamRequest::AAudioStreamRequest(const StreamRequest& parcelable) : 
StreamRequest AAudioStreamRequest::parcelable() const {

    StreamRequest result;

    result.params = std::move(mConfiguration).parcelable();

    result.identity = mIdentity;

    result.attributionSource = mAttributionSource;

    result.sharingModeMatchRequired = mSharingModeMatchRequired;

    result.inService = mInService;

    return result;
@@ -50,7 +50,7 @@ aaudio_result_t AAudioStreamRequest::validate() const { 
}



void AAudioStreamRequest::dump() const {

    ALOGD("mIdentity  = %s", mIdentity.toString().c_str());

    ALOGD("mAttributionSource  = %s", mAttributionSource.toString().c_str());

    ALOGD("mSharingModeMatchRequired = %d", mSharingModeMatchRequired);

    ALOGD("mInService = %d", mInService);

    mConfiguration.dump();