commit 275e157c34698ff892cab899cf64d264288b19a2
author Yiwei Zhang <zzyiwei@google.com> Fri Aug 23 03:09:35 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Aug 23 03:09:35 2019 -0700
tree edce5e89de6200119f952b5fda1f598356f04780
parent 101286bd1e35980da226ddcc61fb415a73532dce
parent 54b5e49fd39bf7cb8d1455d8c6a1620ef4ba74f6

Merge "libvulkan: add a nullptr check for ANativeWindow*" am: 52d84f8f25 am: 9eee7a7f34
am: 54b5e49fd3

Change-Id: Ie4b1cc869916a52b6ea989262e38c220aeb69498

vulkan/libvulkan/swapchain.cpp

diff --git a/vulkan/libvulkan/swapchain.cpp b/vulkan/libvulkan/swapchain.cpp
index a8949d3..5f4c6b1 100644
--- a/vulkan/libvulkan/swapchain.cpp
+++ b/vulkan/libvulkan/swapchain.cpp
@@ -1381,7 +1381,7 @@
     bool active = swapchain->surface.swapchain_handle == swapchain_handle;
     ANativeWindow* window = active ? swapchain->surface.window.get() : nullptr;
 
-    if (swapchain->frame_timestamps_enabled) {
+    if (window && swapchain->frame_timestamps_enabled) {
         native_window_enable_frame_timestamps(window, false);
     }
     for (uint32_t i = 0; i < swapchain->num_images; i++)