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

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

Snap for 13599671 from c71357fb to 25Q3-release 

Change-Id: I75747d4eb198b1480d2626b7a6750941b11eb071
parents e41c5e4e c71357fb

camera/ndk/include/camera/NdkCameraMetadataTags.h

+1 −1
Original line number Diff line number Diff line
@@ -2425,7 +2425,7 @@ typedef enum acamera_metadata_tag { 
     *

     * <p>If set to AUTO, the camera device detects which capture request key the application uses

     * to do zoom, ACAMERA_SCALER_CROP_REGION or ACAMERA_CONTROL_ZOOM_RATIO. If

     * the application doesn't set android.scaler.zoomRatio or sets it to 1.0 in the capture

     * the application doesn't set ACAMERA_CONTROL_ZOOM_RATIO or sets it to 1.0 in the capture

     * request, the effective zoom level is reflected in ACAMERA_SCALER_CROP_REGION in capture

     * results. If ACAMERA_CONTROL_ZOOM_RATIO is set to values other than 1.0, the effective

     * zoom level is reflected in ACAMERA_CONTROL_ZOOM_RATIO. AUTO is the default value

media/aconfig/codec_fwk.aconfig

+9 −0
Original line number Diff line number Diff line
@@ -28,6 +28,15 @@ flag { 
  bug: "375464302"

}



flag {

  name: "audio_mix_presentation_support"

  is_exported: true

  is_fixed_read_only: true

  namespace: "codec_fwk"

  description: "Feature flag for MediaFormat KEY_AUDIO_PRESENTATION_ID"

  bug: "418795315"

}



flag {

  name: "codec_availability"

  namespace: "codec_fwk"

media/audioserver/OWNERS

+0 −1
Original line number Diff line number Diff line 
# Bug component: 48436

atneya@google.com

hunga@google.com

philburk@google.com

include platform/frameworks/av:/media/janitors/audio_OWNERS #{LAST_RESORT_SUGGESTION}

media/libaaudio/OWNERS

+2 −1
Original line number Diff line number Diff line 
# Bug component: 48436

jiabin@google.com

philburk@google.com

hunga@google.com

elaurent@google.com

include platform/frameworks/av:/media/janitors/audio_OWNERS #{LAST_RESORT_SUGGESTION}

media/libaudiofoundation/include/media/AudioPort.h

+1 −0
Original line number Diff line number Diff line
@@ -114,6 +114,7 @@ public: 
                        ((mFlags.input & AUDIO_INPUT_FLAG_MMAP_NOIRQ) != 0)));

    }



    void setHalIdForTest(int32_t halId) { mHalId = halId; }

    int32_t getHalId() const { return mHalId; }



    void dump(std::string *dst, int spaces,