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

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

Snap for 10196038 from 9d3e77f9 to udc-qpr1-release 

Change-Id: I5625ac6a0c3b7fd1472694e8917700f32b229ead
parents 3df5431b 9d3e77f9

audio/aidl/default/config/audioPolicy/api/current.txt

+5 −0
Original line number Diff line number Diff line
@@ -33,14 +33,19 @@ package android.audio.policy.configuration { 
    enum_constant public static final android.audio.policy.configuration.AudioChannelMask AUDIO_CHANNEL_INDEX_MASK_8;

    enum_constant public static final android.audio.policy.configuration.AudioChannelMask AUDIO_CHANNEL_INDEX_MASK_9;

    enum_constant public static final android.audio.policy.configuration.AudioChannelMask AUDIO_CHANNEL_IN_2POINT0POINT2;

    enum_constant public static final android.audio.policy.configuration.AudioChannelMask AUDIO_CHANNEL_IN_2POINT1;

    enum_constant public static final android.audio.policy.configuration.AudioChannelMask AUDIO_CHANNEL_IN_2POINT1POINT2;

    enum_constant public static final android.audio.policy.configuration.AudioChannelMask AUDIO_CHANNEL_IN_3POINT0POINT2;

    enum_constant public static final android.audio.policy.configuration.AudioChannelMask AUDIO_CHANNEL_IN_3POINT1;

    enum_constant public static final android.audio.policy.configuration.AudioChannelMask AUDIO_CHANNEL_IN_3POINT1POINT2;

    enum_constant public static final android.audio.policy.configuration.AudioChannelMask AUDIO_CHANNEL_IN_5POINT1;

    enum_constant public static final android.audio.policy.configuration.AudioChannelMask AUDIO_CHANNEL_IN_6;

    enum_constant public static final android.audio.policy.configuration.AudioChannelMask AUDIO_CHANNEL_IN_FRONT_BACK;

    enum_constant public static final android.audio.policy.configuration.AudioChannelMask AUDIO_CHANNEL_IN_MONO;

    enum_constant public static final android.audio.policy.configuration.AudioChannelMask AUDIO_CHANNEL_IN_PENTA;

    enum_constant public static final android.audio.policy.configuration.AudioChannelMask AUDIO_CHANNEL_IN_QUAD;

    enum_constant public static final android.audio.policy.configuration.AudioChannelMask AUDIO_CHANNEL_IN_STEREO;

    enum_constant public static final android.audio.policy.configuration.AudioChannelMask AUDIO_CHANNEL_IN_TRI;

    enum_constant public static final android.audio.policy.configuration.AudioChannelMask AUDIO_CHANNEL_IN_VOICE_CALL_MONO;

    enum_constant public static final android.audio.policy.configuration.AudioChannelMask AUDIO_CHANNEL_IN_VOICE_DNLINK_MONO;

    enum_constant public static final android.audio.policy.configuration.AudioChannelMask AUDIO_CHANNEL_IN_VOICE_UPLINK_MONO;

audio/aidl/default/config/audioPolicy/audio_policy_configuration.xsd

+5 −0
Original line number Diff line number Diff line
@@ -535,12 +535,17 @@ 
            <xs:enumeration value="AUDIO_CHANNEL_OUT_STEREO_HAPTIC_AB"/>

            <xs:enumeration value="AUDIO_CHANNEL_IN_MONO"/>

            <xs:enumeration value="AUDIO_CHANNEL_IN_STEREO"/>

            <xs:enumeration value="AUDIO_CHANNEL_IN_2POINT1"/>

            <xs:enumeration value="AUDIO_CHANNEL_IN_FRONT_BACK"/>

            <xs:enumeration value="AUDIO_CHANNEL_IN_TRI"/>

            <xs:enumeration value="AUDIO_CHANNEL_IN_3POINT1"/>

            <xs:enumeration value="AUDIO_CHANNEL_IN_6"/>

            <xs:enumeration value="AUDIO_CHANNEL_IN_2POINT0POINT2"/>

            <xs:enumeration value="AUDIO_CHANNEL_IN_2POINT1POINT2"/>

            <xs:enumeration value="AUDIO_CHANNEL_IN_3POINT0POINT2"/>

            <xs:enumeration value="AUDIO_CHANNEL_IN_3POINT1POINT2"/>

            <xs:enumeration value="AUDIO_CHANNEL_IN_QUAD"/>

            <xs:enumeration value="AUDIO_CHANNEL_IN_PENTA"/>

            <xs:enumeration value="AUDIO_CHANNEL_IN_5POINT1"/>

            <xs:enumeration value="AUDIO_CHANNEL_IN_VOICE_UPLINK_MONO"/>

            <xs:enumeration value="AUDIO_CHANNEL_IN_VOICE_DNLINK_MONO"/>

camera/provider/aidl/vts/VtsAidlHalCameraProvider_TargetTest.cpp

+10 −11
Original line number Diff line number Diff line
@@ -2063,16 +2063,15 @@ TEST_P(CameraAidlTest, process10BitColorSpaceRequests) { 
TEST_P(CameraAidlTest, processZoomSettingsOverrideRequests) {

    const int32_t kFrameCount = 5;

    const int32_t kTestCases = 2;

    const bool kOverrideSequence[kTestCases][kFrameCount] = {

        // ZOOM, ZOOM, ZOOM, ZOOM, ZOOM;

    const bool kOverrideSequence[kTestCases][kFrameCount] = {// ZOOM, ZOOM, ZOOM, ZOOM, ZOOM;

                                                             {true, true, true, true, true},

        // OFF, OFF, ZOOM, ZOOM, OFF;

        { false, false, true, true, false } };

                                                             // OFF, ZOOM, ZOOM, ZOOM, OFF;

                                                             {false, true, true, true, false}};

    const bool kExpectedOverrideResults[kTestCases][kFrameCount] = {

            // All resuls should be overridden except the last one. The last result's

            // zoom doesn't have speed-up.

            {true, true, true, true, false},

        // Because we require at least 2 frames speed-up, request #1, #2 and #3

            // Because we require at least 1 frame speed-up, request #1, #2 and #3

            // will be overridden.

            {true, true, true, false, false}};