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

Commit e2c89e8e authored by Samip Garg's avatar Samip Garg Committed by Xin Li
Browse files

Merge "Snap tm-dev to android13-tests-dev" into tm-dev am: c269016c 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/20514446



Merged-In: Ie59041dc0f220cbd69c59ef46ed12aac939fb5fa
Change-Id: I4941e55ab93028afbdb769d1a2e9dc6d78659b38
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0bf07b11 c269016c

media/libmedia/xsd/api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -47,7 +47,9 @@ package media.profiles { 
    method public java.util.List<media.profiles.EncoderProfile> getEncoderProfile_optional();

    method public java.util.List<media.profiles.CamcorderProfiles.ImageDecodingOptional> getImageDecoding_optional();

    method public java.util.List<media.profiles.CamcorderProfiles.ImageEncodingOptional> getImageEncoding_optional();

    method public int getStartOffsetMs();

    method public void setCameraId(int);

    method public void setStartOffsetMs(int);

  }



  public static class CamcorderProfiles.ImageDecodingOptional {

media/libmedia/xsd/media_profiles.xsd

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ 
            </xs:element>

        </xs:choice>

        <xs:attribute name="cameraId" type="xs:int"/>

        <xs:attribute name="startOffsetMs" type="xs:int"/>

    </xs:complexType>

    <xs:complexType name="EncoderProfile">

        <xs:sequence>