| commit | f927136f5e132935493e94f0e57e609d0a791738 | [log] [tgz] |
|---|---|---|
| author | Shikha Malhotra <shikhamalhotra@google.com> | Tue Mar 22 16:49:23 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Mar 22 16:49:23 2022 +0000 |
| tree | 0a363fad62b9eb5b81016dd24be12d40a9a5337c | |
| parent | 6dee456064165a6bb745f8a40004e65ccf5698ec [diff] | |
| parent | adb5da5fbbd4157fb6bbb4629b48d83d6a8b1fe6 [diff] |
Merge "Added support to calculate storage using project ids on devices whose user data is wiped and their add directories are created using project id Bug: b/215154615 Test: atest StorageHostTest Test: atest tests/installd_service_test.cpp Change-Id: Ib29af7c4c0e80d5b8902899b38de41a807e1cd72 Merged-In: Idfe262d5606a4f577587e75e4a29fdb55c021a37" am: adb5da5fbb Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1947567 Change-Id: I07f8225464ac079f6cb678fd64c9041aceaa3c58
diff --git a/vulkan/libvulkan/swapchain.cpp b/vulkan/libvulkan/swapchain.cpp index 0b9ba05..5e36adf 100644 --- a/vulkan/libvulkan/swapchain.cpp +++ b/vulkan/libvulkan/swapchain.cpp
@@ -805,10 +805,6 @@ } } - // NOTE: Any new formats that are added must be coordinated across different - // Android users. This includes the ANGLE team (a layered implementation of - // OpenGL-ES). - VkResult result = VK_SUCCESS; if (formats) { uint32_t transfer_count = all_formats.size();