commit | a9280a2fa58218baa307cddef45d5416956b7619 | [log] [tgz] |
---|---|---|
author | Matt Lee <matthewhlee@google.com> | Tue Dec 06 21:40:27 2022 -0800 |
committer | Matt Lee <matthewhlee@google.com> | Tue Dec 06 21:40:27 2022 -0800 |
tree | a908e17ffd3244562cea62164ff63bf07cb0ec95 | |
parent | 935514cab98f72e1dc74978563703ad72149903a [diff] | |
parent | 98c2b68bb8a619e1805ecea4677121d06e0240a6 [diff] |
Merge t-qpr-2022-12 Change-Id: Icdd9789c72372094b03f64a78713bd9ef858505f
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libexpat.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libexpat.so index 6abac9c..695d0f7 100755 --- a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libexpat.so +++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libexpat.so Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libgui.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libgui.so index f7cf91b..456c4fc 100755 --- a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libgui.so +++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libgui.so Binary files differ
diff --git a/arm/include/frameworks/native/libs/gui/include/gui/SurfaceControl.h b/arm/include/frameworks/native/libs/gui/include/gui/SurfaceControl.h index 9ee4636..ed14ec6 100644 --- a/arm/include/frameworks/native/libs/gui/include/gui/SurfaceControl.h +++ b/arm/include/frameworks/native/libs/gui/include/gui/SurfaceControl.h
@@ -118,12 +118,13 @@ mutable sp<Surface> mSurfaceData; mutable sp<BLASTBufferQueue> mBbq; mutable sp<SurfaceControl> mBbqChild; - int32_t mLayerId; - uint32_t mTransformHint; - uint32_t mWidth; - uint32_t mHeight; - PixelFormat mFormat; - uint32_t mCreateFlags; + + int32_t mLayerId = 0; + uint32_t mTransformHint = 0; + uint32_t mWidth = 0; + uint32_t mHeight = 0; + PixelFormat mFormat = PIXEL_FORMAT_NONE; + uint32_t mCreateFlags = 0; }; }; // namespace android
diff --git a/arm64/arch-arm-armv8-a/shared/vndk-core/libexpat.so b/arm64/arch-arm-armv8-a/shared/vndk-core/libexpat.so index 4d20d7c..4cb6c60 100755 --- a/arm64/arch-arm-armv8-a/shared/vndk-core/libexpat.so +++ b/arm64/arch-arm-armv8-a/shared/vndk-core/libexpat.so Binary files differ
diff --git a/arm64/arch-arm-armv8-a/shared/vndk-core/libgui.so b/arm64/arch-arm-armv8-a/shared/vndk-core/libgui.so index 46003cc..c680172 100755 --- a/arm64/arch-arm-armv8-a/shared/vndk-core/libgui.so +++ b/arm64/arch-arm-armv8-a/shared/vndk-core/libgui.so Binary files differ
diff --git a/arm64/arch-arm64-armv8-a/shared/vndk-core/libexpat.so b/arm64/arch-arm64-armv8-a/shared/vndk-core/libexpat.so index 62e4d55..0dffd1f 100755 --- a/arm64/arch-arm64-armv8-a/shared/vndk-core/libexpat.so +++ b/arm64/arch-arm64-armv8-a/shared/vndk-core/libexpat.so Binary files differ
diff --git a/arm64/arch-arm64-armv8-a/shared/vndk-core/libgui.so b/arm64/arch-arm64-armv8-a/shared/vndk-core/libgui.so index d94989d..6b911f7 100755 --- a/arm64/arch-arm64-armv8-a/shared/vndk-core/libgui.so +++ b/arm64/arch-arm64-armv8-a/shared/vndk-core/libgui.so Binary files differ
diff --git a/arm64/include/frameworks/native/libs/gui/include/gui/SurfaceControl.h b/arm64/include/frameworks/native/libs/gui/include/gui/SurfaceControl.h index 9ee4636..ed14ec6 100644 --- a/arm64/include/frameworks/native/libs/gui/include/gui/SurfaceControl.h +++ b/arm64/include/frameworks/native/libs/gui/include/gui/SurfaceControl.h
@@ -118,12 +118,13 @@ mutable sp<Surface> mSurfaceData; mutable sp<BLASTBufferQueue> mBbq; mutable sp<SurfaceControl> mBbqChild; - int32_t mLayerId; - uint32_t mTransformHint; - uint32_t mWidth; - uint32_t mHeight; - PixelFormat mFormat; - uint32_t mCreateFlags; + + int32_t mLayerId = 0; + uint32_t mTransformHint = 0; + uint32_t mWidth = 0; + uint32_t mHeight = 0; + PixelFormat mFormat = PIXEL_FORMAT_NONE; + uint32_t mCreateFlags = 0; }; }; // namespace android
diff --git a/x86/arch-x86/shared/vndk-core/libexpat.so b/x86/arch-x86/shared/vndk-core/libexpat.so index 8c34339..2612a5c 100755 --- a/x86/arch-x86/shared/vndk-core/libexpat.so +++ b/x86/arch-x86/shared/vndk-core/libexpat.so Binary files differ
diff --git a/x86/arch-x86/shared/vndk-core/libgui.so b/x86/arch-x86/shared/vndk-core/libgui.so index 6440104..9bfeba9 100755 --- a/x86/arch-x86/shared/vndk-core/libgui.so +++ b/x86/arch-x86/shared/vndk-core/libgui.so Binary files differ
diff --git a/x86/include/frameworks/native/libs/gui/include/gui/SurfaceControl.h b/x86/include/frameworks/native/libs/gui/include/gui/SurfaceControl.h index 9ee4636..ed14ec6 100644 --- a/x86/include/frameworks/native/libs/gui/include/gui/SurfaceControl.h +++ b/x86/include/frameworks/native/libs/gui/include/gui/SurfaceControl.h
@@ -118,12 +118,13 @@ mutable sp<Surface> mSurfaceData; mutable sp<BLASTBufferQueue> mBbq; mutable sp<SurfaceControl> mBbqChild; - int32_t mLayerId; - uint32_t mTransformHint; - uint32_t mWidth; - uint32_t mHeight; - PixelFormat mFormat; - uint32_t mCreateFlags; + + int32_t mLayerId = 0; + uint32_t mTransformHint = 0; + uint32_t mWidth = 0; + uint32_t mHeight = 0; + PixelFormat mFormat = PIXEL_FORMAT_NONE; + uint32_t mCreateFlags = 0; }; }; // namespace android
diff --git a/x86_64/arch-x86-x86_64/shared/vndk-core/libexpat.so b/x86_64/arch-x86-x86_64/shared/vndk-core/libexpat.so index 336d7be..2da97b3 100755 --- a/x86_64/arch-x86-x86_64/shared/vndk-core/libexpat.so +++ b/x86_64/arch-x86-x86_64/shared/vndk-core/libexpat.so Binary files differ
diff --git a/x86_64/arch-x86-x86_64/shared/vndk-core/libgui.so b/x86_64/arch-x86-x86_64/shared/vndk-core/libgui.so index 06c44bc..d37928b 100755 --- a/x86_64/arch-x86-x86_64/shared/vndk-core/libgui.so +++ b/x86_64/arch-x86-x86_64/shared/vndk-core/libgui.so Binary files differ
diff --git a/x86_64/arch-x86_64/shared/vndk-core/libexpat.so b/x86_64/arch-x86_64/shared/vndk-core/libexpat.so index d87c967..303a7f5 100755 --- a/x86_64/arch-x86_64/shared/vndk-core/libexpat.so +++ b/x86_64/arch-x86_64/shared/vndk-core/libexpat.so Binary files differ
diff --git a/x86_64/arch-x86_64/shared/vndk-core/libgui.so b/x86_64/arch-x86_64/shared/vndk-core/libgui.so index 7747ba1..39c6c57 100755 --- a/x86_64/arch-x86_64/shared/vndk-core/libgui.so +++ b/x86_64/arch-x86_64/shared/vndk-core/libgui.so Binary files differ
diff --git a/x86_64/include/frameworks/native/libs/gui/include/gui/SurfaceControl.h b/x86_64/include/frameworks/native/libs/gui/include/gui/SurfaceControl.h index 9ee4636..ed14ec6 100644 --- a/x86_64/include/frameworks/native/libs/gui/include/gui/SurfaceControl.h +++ b/x86_64/include/frameworks/native/libs/gui/include/gui/SurfaceControl.h
@@ -118,12 +118,13 @@ mutable sp<Surface> mSurfaceData; mutable sp<BLASTBufferQueue> mBbq; mutable sp<SurfaceControl> mBbqChild; - int32_t mLayerId; - uint32_t mTransformHint; - uint32_t mWidth; - uint32_t mHeight; - PixelFormat mFormat; - uint32_t mCreateFlags; + + int32_t mLayerId = 0; + uint32_t mTransformHint = 0; + uint32_t mWidth = 0; + uint32_t mHeight = 0; + PixelFormat mFormat = PIXEL_FORMAT_NONE; + uint32_t mCreateFlags = 0; }; }; // namespace android