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

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

Snap for 7549382 from b9f6cdd3 to sc-v2-release 

Change-Id: I4ce69b1e8d5da6ee3194b3ab5e8f9d81dd4aa217
parents 4ae0b0d4 b9f6cdd3

camera/metadata/3.2/types.hal

+3 −1
Original line number Diff line number Diff line
@@ -686,7 +686,9 @@ enum CameraMetadataTag : uint32_t { 
    /** android.jpeg.maxSize [static, int32, system]

     *

     * <p>Maximum size in bytes for the compressed

     * JPEG buffer</p>

     * JPEG buffer, in default sensor pixel mode (see ANDROID_SENSOR_PIXEL_MODE)</p>

     *

     * @see ANDROID_SENSOR_PIXEL_MODE

     */

    ANDROID_JPEG_MAX_SIZE,

current.txt

+2 −0
Original line number Diff line number Diff line
@@ -768,6 +768,8 @@ a64467bae843569f0d465c5be7f0c7a5b987985b55a3ef4794dd5afc68538650 android.hardwar 
98592d193a717066facf91428426e5abe211e3bd718bc372e29fb944ddbe6e7c android.hardware.wifi.supplicant@1.3::types



# ABI preserving changes to HALs during Android S

# b/193346383

93d29fbe2fcc5e4e053a9db7c9abbd9190c46b85b443f2698a3460db2ee76c8d android.hardware.camera.metadata@3.2::types

159a0069336035852e9eca6354b86b7990680d1b239f23ef2f631b01807c4cb9 android.hardware.camera.metadata@3.5::types

e042522daa4b5f7fd4a0a19bcdadb93c79a1b04c09ef2c9813a3a8941032f3f5 android.hardware.contexthub@1.0::IContexthub

c2f64133b83ede65c9939ef97ab5bd867b73faf3dba0e7e69f77c3c43d9e487e android.hardware.contexthub@1.0::IContexthubCallback

vibrator/aidl/vts/VtsHalVibratorTargetTest.cpp

+8 −7
Original line number Diff line number Diff line
@@ -60,9 +60,10 @@ const std::vector<CompositePrimitive> kCompositePrimitives{ 
    android::enum_range<CompositePrimitive>().begin(),

    android::enum_range<CompositePrimitive>().end()};



const std::vector<CompositePrimitive> kOptionalPrimitives = {

    CompositePrimitive::THUD,

    CompositePrimitive::SPIN,

const std::vector<CompositePrimitive> kRequiredPrimitives = {

        CompositePrimitive::CLICK,      CompositePrimitive::LIGHT_TICK,

        CompositePrimitive::QUICK_RISE, CompositePrimitive::SLOW_RISE,

        CompositePrimitive::QUICK_FALL,

};



const std::vector<CompositePrimitive> kInvalidPrimitives = {
@@ -393,11 +394,11 @@ TEST_P(VibratorAidl, GetSupportedPrimitives) { 
        for (auto primitive : kCompositePrimitives) {

            bool isPrimitiveSupported =

                std::find(supported.begin(), supported.end(), primitive) != supported.end();

            bool isPrimitiveOptional =

                std::find(kOptionalPrimitives.begin(), kOptionalPrimitives.end(), primitive) !=

                kOptionalPrimitives.end();

            bool isPrimitiveRequired =

                    std::find(kRequiredPrimitives.begin(), kRequiredPrimitives.end(), primitive) !=

                    kRequiredPrimitives.end();



            EXPECT_TRUE(isPrimitiveSupported || isPrimitiveOptional) << toString(primitive);

            EXPECT_TRUE(isPrimitiveSupported || !isPrimitiveRequired) << toString(primitive);

        }

    }

}