Because of the size limitation of protect heap, we ignore the "VK_ERROR_OUT_OF_DEVICE_MEMORY" when total number of protected memory reaches 100 times. Bug:135661263 Change-Id: Iff817e9623b44507f00210c47100ec37bf391300
am: 55146afb82

Change-Id: I6fc3f1fe928ac2c850ff598176698900bc0b8eff
diff --git a/android/cts/master/egl-master-risky.txt b/android/cts/master/egl-master-risky.txt
index 3f002c0..e69de29 100644
--- a/android/cts/master/egl-master-risky.txt
+++ b/android/cts/master/egl-master-risky.txt
@@ -1,199 +0,0 @@
-dEQP-EGL.functional.create_surface.window.rgb565_no_depth_no_stencil
-dEQP-EGL.functional.create_surface.window.rgb565_no_depth_stencil
-dEQP-EGL.functional.create_surface.window.rgb565_depth_no_stencil
-dEQP-EGL.functional.create_surface.window.rgb565_depth_stencil
-dEQP-EGL.functional.create_surface.window.rgb888_no_depth_no_stencil
-dEQP-EGL.functional.create_surface.window.rgb888_no_depth_stencil
-dEQP-EGL.functional.create_surface.window.rgb888_depth_no_stencil
-dEQP-EGL.functional.create_surface.window.rgb888_depth_stencil
-dEQP-EGL.functional.create_surface.window.rgba4444_no_depth_no_stencil
-dEQP-EGL.functional.create_surface.window.rgba4444_no_depth_stencil
-dEQP-EGL.functional.create_surface.window.rgba4444_depth_no_stencil
-dEQP-EGL.functional.create_surface.window.rgba4444_depth_stencil
-dEQP-EGL.functional.create_surface.window.rgba5551_no_depth_no_stencil
-dEQP-EGL.functional.create_surface.window.rgba5551_no_depth_stencil
-dEQP-EGL.functional.create_surface.window.rgba5551_depth_no_stencil
-dEQP-EGL.functional.create_surface.window.rgba5551_depth_stencil
-dEQP-EGL.functional.create_surface.window.rgba8888_no_depth_no_stencil
-dEQP-EGL.functional.create_surface.window.rgba8888_no_depth_stencil
-dEQP-EGL.functional.create_surface.window.rgba8888_depth_no_stencil
-dEQP-EGL.functional.create_surface.window.rgba8888_depth_stencil
-dEQP-EGL.functional.create_surface.window.other
-dEQP-EGL.functional.create_surface.pixmap.rgb565_no_depth_no_stencil
-dEQP-EGL.functional.create_surface.pixmap.rgb565_no_depth_stencil
-dEQP-EGL.functional.create_surface.pixmap.rgb565_depth_no_stencil
-dEQP-EGL.functional.create_surface.pixmap.rgb565_depth_stencil
-dEQP-EGL.functional.create_surface.pixmap.rgb888_no_depth_no_stencil
-dEQP-EGL.functional.create_surface.pixmap.rgb888_no_depth_stencil
-dEQP-EGL.functional.create_surface.pixmap.rgb888_depth_no_stencil
-dEQP-EGL.functional.create_surface.pixmap.rgb888_depth_stencil
-dEQP-EGL.functional.create_surface.pixmap.rgba4444_no_depth_no_stencil
-dEQP-EGL.functional.create_surface.pixmap.rgba4444_no_depth_stencil
-dEQP-EGL.functional.create_surface.pixmap.rgba4444_depth_no_stencil
-dEQP-EGL.functional.create_surface.pixmap.rgba4444_depth_stencil
-dEQP-EGL.functional.create_surface.pixmap.rgba5551_no_depth_no_stencil
-dEQP-EGL.functional.create_surface.pixmap.rgba5551_no_depth_stencil
-dEQP-EGL.functional.create_surface.pixmap.rgba5551_depth_no_stencil
-dEQP-EGL.functional.create_surface.pixmap.rgba5551_depth_stencil
-dEQP-EGL.functional.create_surface.pixmap.rgba8888_no_depth_no_stencil
-dEQP-EGL.functional.create_surface.pixmap.rgba8888_no_depth_stencil
-dEQP-EGL.functional.create_surface.pixmap.rgba8888_depth_no_stencil
-dEQP-EGL.functional.create_surface.pixmap.rgba8888_depth_stencil
-dEQP-EGL.functional.create_surface.pixmap.other
-dEQP-EGL.functional.create_surface.pbuffer.rgb565_no_depth_no_stencil
-dEQP-EGL.functional.create_surface.pbuffer.rgb565_no_depth_stencil
-dEQP-EGL.functional.create_surface.pbuffer.rgb565_depth_no_stencil
-dEQP-EGL.functional.create_surface.pbuffer.rgb565_depth_stencil
-dEQP-EGL.functional.create_surface.pbuffer.rgb888_no_depth_no_stencil
-dEQP-EGL.functional.create_surface.pbuffer.rgb888_no_depth_stencil
-dEQP-EGL.functional.create_surface.pbuffer.rgb888_depth_no_stencil
-dEQP-EGL.functional.create_surface.pbuffer.rgb888_depth_stencil
-dEQP-EGL.functional.create_surface.pbuffer.rgba4444_no_depth_no_stencil
-dEQP-EGL.functional.create_surface.pbuffer.rgba4444_no_depth_stencil
-dEQP-EGL.functional.create_surface.pbuffer.rgba4444_depth_no_stencil
-dEQP-EGL.functional.create_surface.pbuffer.rgba4444_depth_stencil
-dEQP-EGL.functional.create_surface.pbuffer.rgba5551_no_depth_no_stencil
-dEQP-EGL.functional.create_surface.pbuffer.rgba5551_no_depth_stencil
-dEQP-EGL.functional.create_surface.pbuffer.rgba5551_depth_no_stencil
-dEQP-EGL.functional.create_surface.pbuffer.rgba5551_depth_stencil
-dEQP-EGL.functional.create_surface.pbuffer.rgba8888_no_depth_no_stencil
-dEQP-EGL.functional.create_surface.pbuffer.rgba8888_no_depth_stencil
-dEQP-EGL.functional.create_surface.pbuffer.rgba8888_depth_no_stencil
-dEQP-EGL.functional.create_surface.pbuffer.rgba8888_depth_stencil
-dEQP-EGL.functional.create_surface.pbuffer.other
-dEQP-EGL.functional.create_surface.platform_ext_window.rgb565_no_depth_no_stencil
-dEQP-EGL.functional.create_surface.platform_ext_window.rgb565_no_depth_stencil
-dEQP-EGL.functional.create_surface.platform_ext_window.rgb565_depth_no_stencil
-dEQP-EGL.functional.create_surface.platform_ext_window.rgb565_depth_stencil
-dEQP-EGL.functional.create_surface.platform_ext_window.rgb888_no_depth_no_stencil
-dEQP-EGL.functional.create_surface.platform_ext_window.rgb888_no_depth_stencil
-dEQP-EGL.functional.create_surface.platform_ext_window.rgb888_depth_no_stencil
-dEQP-EGL.functional.create_surface.platform_ext_window.rgb888_depth_stencil
-dEQP-EGL.functional.create_surface.platform_ext_window.rgba4444_no_depth_no_stencil
-dEQP-EGL.functional.create_surface.platform_ext_window.rgba4444_no_depth_stencil
-dEQP-EGL.functional.create_surface.platform_ext_window.rgba4444_depth_no_stencil
-dEQP-EGL.functional.create_surface.platform_ext_window.rgba4444_depth_stencil
-dEQP-EGL.functional.create_surface.platform_ext_window.rgba5551_no_depth_no_stencil
-dEQP-EGL.functional.create_surface.platform_ext_window.rgba5551_no_depth_stencil
-dEQP-EGL.functional.create_surface.platform_ext_window.rgba5551_depth_no_stencil
-dEQP-EGL.functional.create_surface.platform_ext_window.rgba5551_depth_stencil
-dEQP-EGL.functional.create_surface.platform_ext_window.rgba8888_no_depth_no_stencil
-dEQP-EGL.functional.create_surface.platform_ext_window.rgba8888_no_depth_stencil
-dEQP-EGL.functional.create_surface.platform_ext_window.rgba8888_depth_no_stencil
-dEQP-EGL.functional.create_surface.platform_ext_window.rgba8888_depth_stencil
-dEQP-EGL.functional.create_surface.platform_ext_window.other
-dEQP-EGL.functional.create_surface.platform_ext_pixmap.rgb565_no_depth_no_stencil
-dEQP-EGL.functional.create_surface.platform_ext_pixmap.rgb565_no_depth_stencil
-dEQP-EGL.functional.create_surface.platform_ext_pixmap.rgb565_depth_no_stencil
-dEQP-EGL.functional.create_surface.platform_ext_pixmap.rgb565_depth_stencil
-dEQP-EGL.functional.create_surface.platform_ext_pixmap.rgb888_no_depth_no_stencil
-dEQP-EGL.functional.create_surface.platform_ext_pixmap.rgb888_no_depth_stencil
-dEQP-EGL.functional.create_surface.platform_ext_pixmap.rgb888_depth_no_stencil
-dEQP-EGL.functional.create_surface.platform_ext_pixmap.rgb888_depth_stencil
-dEQP-EGL.functional.create_surface.platform_ext_pixmap.rgba4444_no_depth_no_stencil
-dEQP-EGL.functional.create_surface.platform_ext_pixmap.rgba4444_no_depth_stencil
-dEQP-EGL.functional.create_surface.platform_ext_pixmap.rgba4444_depth_no_stencil
-dEQP-EGL.functional.create_surface.platform_ext_pixmap.rgba4444_depth_stencil
-dEQP-EGL.functional.create_surface.platform_ext_pixmap.rgba5551_no_depth_no_stencil
-dEQP-EGL.functional.create_surface.platform_ext_pixmap.rgba5551_no_depth_stencil
-dEQP-EGL.functional.create_surface.platform_ext_pixmap.rgba5551_depth_no_stencil
-dEQP-EGL.functional.create_surface.platform_ext_pixmap.rgba5551_depth_stencil
-dEQP-EGL.functional.create_surface.platform_ext_pixmap.rgba8888_no_depth_no_stencil
-dEQP-EGL.functional.create_surface.platform_ext_pixmap.rgba8888_no_depth_stencil
-dEQP-EGL.functional.create_surface.platform_ext_pixmap.rgba8888_depth_no_stencil
-dEQP-EGL.functional.create_surface.platform_ext_pixmap.rgba8888_depth_stencil
-dEQP-EGL.functional.create_surface.platform_ext_pixmap.other
-dEQP-EGL.functional.create_surface.platform_window.rgb565_no_depth_no_stencil
-dEQP-EGL.functional.create_surface.platform_window.rgb565_no_depth_stencil
-dEQP-EGL.functional.create_surface.platform_window.rgb565_depth_no_stencil
-dEQP-EGL.functional.create_surface.platform_window.rgb565_depth_stencil
-dEQP-EGL.functional.create_surface.platform_window.rgb888_no_depth_no_stencil
-dEQP-EGL.functional.create_surface.platform_window.rgb888_no_depth_stencil
-dEQP-EGL.functional.create_surface.platform_window.rgb888_depth_no_stencil
-dEQP-EGL.functional.create_surface.platform_window.rgb888_depth_stencil
-dEQP-EGL.functional.create_surface.platform_window.rgba4444_no_depth_no_stencil
-dEQP-EGL.functional.create_surface.platform_window.rgba4444_no_depth_stencil
-dEQP-EGL.functional.create_surface.platform_window.rgba4444_depth_no_stencil
-dEQP-EGL.functional.create_surface.platform_window.rgba4444_depth_stencil
-dEQP-EGL.functional.create_surface.platform_window.rgba5551_no_depth_no_stencil
-dEQP-EGL.functional.create_surface.platform_window.rgba5551_no_depth_stencil
-dEQP-EGL.functional.create_surface.platform_window.rgba5551_depth_no_stencil
-dEQP-EGL.functional.create_surface.platform_window.rgba5551_depth_stencil
-dEQP-EGL.functional.create_surface.platform_window.rgba8888_no_depth_no_stencil
-dEQP-EGL.functional.create_surface.platform_window.rgba8888_no_depth_stencil
-dEQP-EGL.functional.create_surface.platform_window.rgba8888_depth_no_stencil
-dEQP-EGL.functional.create_surface.platform_window.rgba8888_depth_stencil
-dEQP-EGL.functional.create_surface.platform_window.other
-dEQP-EGL.functional.create_surface.platform_pixmap.rgb565_no_depth_no_stencil
-dEQP-EGL.functional.create_surface.platform_pixmap.rgb565_no_depth_stencil
-dEQP-EGL.functional.create_surface.platform_pixmap.rgb565_depth_no_stencil
-dEQP-EGL.functional.create_surface.platform_pixmap.rgb565_depth_stencil
-dEQP-EGL.functional.create_surface.platform_pixmap.rgb888_no_depth_no_stencil
-dEQP-EGL.functional.create_surface.platform_pixmap.rgb888_no_depth_stencil
-dEQP-EGL.functional.create_surface.platform_pixmap.rgb888_depth_no_stencil
-dEQP-EGL.functional.create_surface.platform_pixmap.rgb888_depth_stencil
-dEQP-EGL.functional.create_surface.platform_pixmap.rgba4444_no_depth_no_stencil
-dEQP-EGL.functional.create_surface.platform_pixmap.rgba4444_no_depth_stencil
-dEQP-EGL.functional.create_surface.platform_pixmap.rgba4444_depth_no_stencil
-dEQP-EGL.functional.create_surface.platform_pixmap.rgba4444_depth_stencil
-dEQP-EGL.functional.create_surface.platform_pixmap.rgba5551_no_depth_no_stencil
-dEQP-EGL.functional.create_surface.platform_pixmap.rgba5551_no_depth_stencil
-dEQP-EGL.functional.create_surface.platform_pixmap.rgba5551_depth_no_stencil
-dEQP-EGL.functional.create_surface.platform_pixmap.rgba5551_depth_stencil
-dEQP-EGL.functional.create_surface.platform_pixmap.rgba8888_no_depth_no_stencil
-dEQP-EGL.functional.create_surface.platform_pixmap.rgba8888_no_depth_stencil
-dEQP-EGL.functional.create_surface.platform_pixmap.rgba8888_depth_no_stencil
-dEQP-EGL.functional.create_surface.platform_pixmap.rgba8888_depth_stencil
-dEQP-EGL.functional.create_surface.platform_pixmap.other
-dEQP-EGL.functional.image.api.invalid_create_image
-dEQP-EGL.functional.fence_sync.valid.create_null_attribs
-dEQP-EGL.functional.fence_sync.valid.create_empty_attribs
-dEQP-EGL.functional.fence_sync.valid.wait_no_timeout
-dEQP-EGL.functional.fence_sync.valid.wait_forever
-dEQP-EGL.functional.fence_sync.valid.wait_no_context
-dEQP-EGL.functional.fence_sync.valid.wait_forever_flush
-dEQP-EGL.functional.fence_sync.valid.get_type
-dEQP-EGL.functional.fence_sync.valid.get_status
-dEQP-EGL.functional.fence_sync.valid.get_status_signaled
-dEQP-EGL.functional.fence_sync.valid.get_condition
-dEQP-EGL.functional.fence_sync.valid.destroy
-dEQP-EGL.functional.fence_sync.valid.wait_server
-dEQP-EGL.functional.fence_sync.invalid.create_invalid_display
-dEQP-EGL.functional.fence_sync.invalid.create_invalid_type
-dEQP-EGL.functional.fence_sync.invalid.create_invalid_attribs
-dEQP-EGL.functional.fence_sync.invalid.create_invalid_context
-dEQP-EGL.functional.fence_sync.invalid.wait_invalid_display
-dEQP-EGL.functional.fence_sync.invalid.wait_invalid_sync
-dEQP-EGL.functional.fence_sync.invalid.get_invalid_display
-dEQP-EGL.functional.fence_sync.invalid.get_invalid_sync
-dEQP-EGL.functional.fence_sync.invalid.get_invalid_attribute
-dEQP-EGL.functional.fence_sync.invalid.get_invalid_value
-dEQP-EGL.functional.fence_sync.invalid.destroy_invalid_display
-dEQP-EGL.functional.fence_sync.invalid.destroy_invalid_sync
-dEQP-EGL.functional.fence_sync.invalid.wait_server_invalid_display
-dEQP-EGL.functional.fence_sync.invalid.wait_server_invalid_sync
-dEQP-EGL.functional.fence_sync.invalid.wait_server_invalid_flag
-dEQP-EGL.functional.get_proc_address.core.egl15
-dEQP-EGL.functional.reusable_sync.valid.create_null_attribs
-dEQP-EGL.functional.reusable_sync.valid.create_empty_attribs
-dEQP-EGL.functional.reusable_sync.valid.wait_no_timeout
-dEQP-EGL.functional.reusable_sync.valid.wait_forever
-dEQP-EGL.functional.reusable_sync.valid.wait_no_context
-dEQP-EGL.functional.reusable_sync.valid.wait_forever_flush
-dEQP-EGL.functional.reusable_sync.valid.get_type
-dEQP-EGL.functional.reusable_sync.valid.get_status
-dEQP-EGL.functional.reusable_sync.valid.get_status_signaled
-dEQP-EGL.functional.reusable_sync.valid.destroy
-dEQP-EGL.functional.reusable_sync.invalid.create_invalid_display
-dEQP-EGL.functional.reusable_sync.invalid.create_invalid_type
-dEQP-EGL.functional.reusable_sync.invalid.create_invalid_attribs
-dEQP-EGL.functional.reusable_sync.invalid.wait_invalid_display
-dEQP-EGL.functional.reusable_sync.invalid.wait_invalid_sync
-dEQP-EGL.functional.reusable_sync.invalid.get_invalid_display
-dEQP-EGL.functional.reusable_sync.invalid.get_invalid_sync
-dEQP-EGL.functional.reusable_sync.invalid.get_invalid_attribute
-dEQP-EGL.functional.reusable_sync.invalid.get_invalid_value
-dEQP-EGL.functional.reusable_sync.invalid.destroy_invalid_display
-dEQP-EGL.functional.reusable_sync.invalid.destroy_invalid_sync
-dEQP-EGL.functional.reusable_sync.invalid.wait_server_invalid_display
-dEQP-EGL.functional.reusable_sync.invalid.wait_server_invalid_sync
diff --git a/android/cts/master/egl-master.txt b/android/cts/master/egl-master.txt
index f7fc1f6..b13dec4 100644
--- a/android/cts/master/egl-master.txt
+++ b/android/cts/master/egl-master.txt
@@ -90,6 +90,153 @@
 dEQP-EGL.functional.query_context.query_context.rgba8888_pixmap
 dEQP-EGL.functional.query_context.query_context.rgba8888_pbuffer
 dEQP-EGL.functional.query_context.query_context.other
+dEQP-EGL.functional.create_surface.window.rgb565_no_depth_no_stencil
+dEQP-EGL.functional.create_surface.window.rgb565_no_depth_stencil
+dEQP-EGL.functional.create_surface.window.rgb565_depth_no_stencil
+dEQP-EGL.functional.create_surface.window.rgb565_depth_stencil
+dEQP-EGL.functional.create_surface.window.rgb888_no_depth_no_stencil
+dEQP-EGL.functional.create_surface.window.rgb888_no_depth_stencil
+dEQP-EGL.functional.create_surface.window.rgb888_depth_no_stencil
+dEQP-EGL.functional.create_surface.window.rgb888_depth_stencil
+dEQP-EGL.functional.create_surface.window.rgba4444_no_depth_no_stencil
+dEQP-EGL.functional.create_surface.window.rgba4444_no_depth_stencil
+dEQP-EGL.functional.create_surface.window.rgba4444_depth_no_stencil
+dEQP-EGL.functional.create_surface.window.rgba4444_depth_stencil
+dEQP-EGL.functional.create_surface.window.rgba5551_no_depth_no_stencil
+dEQP-EGL.functional.create_surface.window.rgba5551_no_depth_stencil
+dEQP-EGL.functional.create_surface.window.rgba5551_depth_no_stencil
+dEQP-EGL.functional.create_surface.window.rgba5551_depth_stencil
+dEQP-EGL.functional.create_surface.window.rgba8888_no_depth_no_stencil
+dEQP-EGL.functional.create_surface.window.rgba8888_no_depth_stencil
+dEQP-EGL.functional.create_surface.window.rgba8888_depth_no_stencil
+dEQP-EGL.functional.create_surface.window.rgba8888_depth_stencil
+dEQP-EGL.functional.create_surface.window.other
+dEQP-EGL.functional.create_surface.pixmap.rgb565_no_depth_no_stencil
+dEQP-EGL.functional.create_surface.pixmap.rgb565_no_depth_stencil
+dEQP-EGL.functional.create_surface.pixmap.rgb565_depth_no_stencil
+dEQP-EGL.functional.create_surface.pixmap.rgb565_depth_stencil
+dEQP-EGL.functional.create_surface.pixmap.rgb888_no_depth_no_stencil
+dEQP-EGL.functional.create_surface.pixmap.rgb888_no_depth_stencil
+dEQP-EGL.functional.create_surface.pixmap.rgb888_depth_no_stencil
+dEQP-EGL.functional.create_surface.pixmap.rgb888_depth_stencil
+dEQP-EGL.functional.create_surface.pixmap.rgba4444_no_depth_no_stencil
+dEQP-EGL.functional.create_surface.pixmap.rgba4444_no_depth_stencil
+dEQP-EGL.functional.create_surface.pixmap.rgba4444_depth_no_stencil
+dEQP-EGL.functional.create_surface.pixmap.rgba4444_depth_stencil
+dEQP-EGL.functional.create_surface.pixmap.rgba5551_no_depth_no_stencil
+dEQP-EGL.functional.create_surface.pixmap.rgba5551_no_depth_stencil
+dEQP-EGL.functional.create_surface.pixmap.rgba5551_depth_no_stencil
+dEQP-EGL.functional.create_surface.pixmap.rgba5551_depth_stencil
+dEQP-EGL.functional.create_surface.pixmap.rgba8888_no_depth_no_stencil
+dEQP-EGL.functional.create_surface.pixmap.rgba8888_no_depth_stencil
+dEQP-EGL.functional.create_surface.pixmap.rgba8888_depth_no_stencil
+dEQP-EGL.functional.create_surface.pixmap.rgba8888_depth_stencil
+dEQP-EGL.functional.create_surface.pixmap.other
+dEQP-EGL.functional.create_surface.pbuffer.rgb565_no_depth_no_stencil
+dEQP-EGL.functional.create_surface.pbuffer.rgb565_no_depth_stencil
+dEQP-EGL.functional.create_surface.pbuffer.rgb565_depth_no_stencil
+dEQP-EGL.functional.create_surface.pbuffer.rgb565_depth_stencil
+dEQP-EGL.functional.create_surface.pbuffer.rgb888_no_depth_no_stencil
+dEQP-EGL.functional.create_surface.pbuffer.rgb888_no_depth_stencil
+dEQP-EGL.functional.create_surface.pbuffer.rgb888_depth_no_stencil
+dEQP-EGL.functional.create_surface.pbuffer.rgb888_depth_stencil
+dEQP-EGL.functional.create_surface.pbuffer.rgba4444_no_depth_no_stencil
+dEQP-EGL.functional.create_surface.pbuffer.rgba4444_no_depth_stencil
+dEQP-EGL.functional.create_surface.pbuffer.rgba4444_depth_no_stencil
+dEQP-EGL.functional.create_surface.pbuffer.rgba4444_depth_stencil
+dEQP-EGL.functional.create_surface.pbuffer.rgba5551_no_depth_no_stencil
+dEQP-EGL.functional.create_surface.pbuffer.rgba5551_no_depth_stencil
+dEQP-EGL.functional.create_surface.pbuffer.rgba5551_depth_no_stencil
+dEQP-EGL.functional.create_surface.pbuffer.rgba5551_depth_stencil
+dEQP-EGL.functional.create_surface.pbuffer.rgba8888_no_depth_no_stencil
+dEQP-EGL.functional.create_surface.pbuffer.rgba8888_no_depth_stencil
+dEQP-EGL.functional.create_surface.pbuffer.rgba8888_depth_no_stencil
+dEQP-EGL.functional.create_surface.pbuffer.rgba8888_depth_stencil
+dEQP-EGL.functional.create_surface.pbuffer.other
+dEQP-EGL.functional.create_surface.platform_ext_window.rgb565_no_depth_no_stencil
+dEQP-EGL.functional.create_surface.platform_ext_window.rgb565_no_depth_stencil
+dEQP-EGL.functional.create_surface.platform_ext_window.rgb565_depth_no_stencil
+dEQP-EGL.functional.create_surface.platform_ext_window.rgb565_depth_stencil
+dEQP-EGL.functional.create_surface.platform_ext_window.rgb888_no_depth_no_stencil
+dEQP-EGL.functional.create_surface.platform_ext_window.rgb888_no_depth_stencil
+dEQP-EGL.functional.create_surface.platform_ext_window.rgb888_depth_no_stencil
+dEQP-EGL.functional.create_surface.platform_ext_window.rgb888_depth_stencil
+dEQP-EGL.functional.create_surface.platform_ext_window.rgba4444_no_depth_no_stencil
+dEQP-EGL.functional.create_surface.platform_ext_window.rgba4444_no_depth_stencil
+dEQP-EGL.functional.create_surface.platform_ext_window.rgba4444_depth_no_stencil
+dEQP-EGL.functional.create_surface.platform_ext_window.rgba4444_depth_stencil
+dEQP-EGL.functional.create_surface.platform_ext_window.rgba5551_no_depth_no_stencil
+dEQP-EGL.functional.create_surface.platform_ext_window.rgba5551_no_depth_stencil
+dEQP-EGL.functional.create_surface.platform_ext_window.rgba5551_depth_no_stencil
+dEQP-EGL.functional.create_surface.platform_ext_window.rgba5551_depth_stencil
+dEQP-EGL.functional.create_surface.platform_ext_window.rgba8888_no_depth_no_stencil
+dEQP-EGL.functional.create_surface.platform_ext_window.rgba8888_no_depth_stencil
+dEQP-EGL.functional.create_surface.platform_ext_window.rgba8888_depth_no_stencil
+dEQP-EGL.functional.create_surface.platform_ext_window.rgba8888_depth_stencil
+dEQP-EGL.functional.create_surface.platform_ext_window.other
+dEQP-EGL.functional.create_surface.platform_ext_pixmap.rgb565_no_depth_no_stencil
+dEQP-EGL.functional.create_surface.platform_ext_pixmap.rgb565_no_depth_stencil
+dEQP-EGL.functional.create_surface.platform_ext_pixmap.rgb565_depth_no_stencil
+dEQP-EGL.functional.create_surface.platform_ext_pixmap.rgb565_depth_stencil
+dEQP-EGL.functional.create_surface.platform_ext_pixmap.rgb888_no_depth_no_stencil
+dEQP-EGL.functional.create_surface.platform_ext_pixmap.rgb888_no_depth_stencil
+dEQP-EGL.functional.create_surface.platform_ext_pixmap.rgb888_depth_no_stencil
+dEQP-EGL.functional.create_surface.platform_ext_pixmap.rgb888_depth_stencil
+dEQP-EGL.functional.create_surface.platform_ext_pixmap.rgba4444_no_depth_no_stencil
+dEQP-EGL.functional.create_surface.platform_ext_pixmap.rgba4444_no_depth_stencil
+dEQP-EGL.functional.create_surface.platform_ext_pixmap.rgba4444_depth_no_stencil
+dEQP-EGL.functional.create_surface.platform_ext_pixmap.rgba4444_depth_stencil
+dEQP-EGL.functional.create_surface.platform_ext_pixmap.rgba5551_no_depth_no_stencil
+dEQP-EGL.functional.create_surface.platform_ext_pixmap.rgba5551_no_depth_stencil
+dEQP-EGL.functional.create_surface.platform_ext_pixmap.rgba5551_depth_no_stencil
+dEQP-EGL.functional.create_surface.platform_ext_pixmap.rgba5551_depth_stencil
+dEQP-EGL.functional.create_surface.platform_ext_pixmap.rgba8888_no_depth_no_stencil
+dEQP-EGL.functional.create_surface.platform_ext_pixmap.rgba8888_no_depth_stencil
+dEQP-EGL.functional.create_surface.platform_ext_pixmap.rgba8888_depth_no_stencil
+dEQP-EGL.functional.create_surface.platform_ext_pixmap.rgba8888_depth_stencil
+dEQP-EGL.functional.create_surface.platform_ext_pixmap.other
+dEQP-EGL.functional.create_surface.platform_window.rgb565_no_depth_no_stencil
+dEQP-EGL.functional.create_surface.platform_window.rgb565_no_depth_stencil
+dEQP-EGL.functional.create_surface.platform_window.rgb565_depth_no_stencil
+dEQP-EGL.functional.create_surface.platform_window.rgb565_depth_stencil
+dEQP-EGL.functional.create_surface.platform_window.rgb888_no_depth_no_stencil
+dEQP-EGL.functional.create_surface.platform_window.rgb888_no_depth_stencil
+dEQP-EGL.functional.create_surface.platform_window.rgb888_depth_no_stencil
+dEQP-EGL.functional.create_surface.platform_window.rgb888_depth_stencil
+dEQP-EGL.functional.create_surface.platform_window.rgba4444_no_depth_no_stencil
+dEQP-EGL.functional.create_surface.platform_window.rgba4444_no_depth_stencil
+dEQP-EGL.functional.create_surface.platform_window.rgba4444_depth_no_stencil
+dEQP-EGL.functional.create_surface.platform_window.rgba4444_depth_stencil
+dEQP-EGL.functional.create_surface.platform_window.rgba5551_no_depth_no_stencil
+dEQP-EGL.functional.create_surface.platform_window.rgba5551_no_depth_stencil
+dEQP-EGL.functional.create_surface.platform_window.rgba5551_depth_no_stencil
+dEQP-EGL.functional.create_surface.platform_window.rgba5551_depth_stencil
+dEQP-EGL.functional.create_surface.platform_window.rgba8888_no_depth_no_stencil
+dEQP-EGL.functional.create_surface.platform_window.rgba8888_no_depth_stencil
+dEQP-EGL.functional.create_surface.platform_window.rgba8888_depth_no_stencil
+dEQP-EGL.functional.create_surface.platform_window.rgba8888_depth_stencil
+dEQP-EGL.functional.create_surface.platform_window.other
+dEQP-EGL.functional.create_surface.platform_pixmap.rgb565_no_depth_no_stencil
+dEQP-EGL.functional.create_surface.platform_pixmap.rgb565_no_depth_stencil
+dEQP-EGL.functional.create_surface.platform_pixmap.rgb565_depth_no_stencil
+dEQP-EGL.functional.create_surface.platform_pixmap.rgb565_depth_stencil
+dEQP-EGL.functional.create_surface.platform_pixmap.rgb888_no_depth_no_stencil
+dEQP-EGL.functional.create_surface.platform_pixmap.rgb888_no_depth_stencil
+dEQP-EGL.functional.create_surface.platform_pixmap.rgb888_depth_no_stencil
+dEQP-EGL.functional.create_surface.platform_pixmap.rgb888_depth_stencil
+dEQP-EGL.functional.create_surface.platform_pixmap.rgba4444_no_depth_no_stencil
+dEQP-EGL.functional.create_surface.platform_pixmap.rgba4444_no_depth_stencil
+dEQP-EGL.functional.create_surface.platform_pixmap.rgba4444_depth_no_stencil
+dEQP-EGL.functional.create_surface.platform_pixmap.rgba4444_depth_stencil
+dEQP-EGL.functional.create_surface.platform_pixmap.rgba5551_no_depth_no_stencil
+dEQP-EGL.functional.create_surface.platform_pixmap.rgba5551_no_depth_stencil
+dEQP-EGL.functional.create_surface.platform_pixmap.rgba5551_depth_no_stencil
+dEQP-EGL.functional.create_surface.platform_pixmap.rgba5551_depth_stencil
+dEQP-EGL.functional.create_surface.platform_pixmap.rgba8888_no_depth_no_stencil
+dEQP-EGL.functional.create_surface.platform_pixmap.rgba8888_no_depth_stencil
+dEQP-EGL.functional.create_surface.platform_pixmap.rgba8888_depth_no_stencil
+dEQP-EGL.functional.create_surface.platform_pixmap.rgba8888_depth_stencil
+dEQP-EGL.functional.create_surface.platform_pixmap.other
 dEQP-EGL.functional.query_surface.simple.window.rgb565_no_depth_no_stencil
 dEQP-EGL.functional.query_surface.simple.window.rgb565_no_depth_stencil
 dEQP-EGL.functional.query_surface.simple.window.rgb565_depth_no_stencil
@@ -802,6 +949,7 @@
 dEQP-EGL.functional.render.multi_thread.gles2_gles3.rgba8888_pixmap
 dEQP-EGL.functional.render.multi_thread.gles2_gles3.rgba8888_pbuffer
 dEQP-EGL.functional.render.multi_thread.gles2_gles3.other
+dEQP-EGL.functional.image.api.invalid_create_image
 dEQP-EGL.functional.image.api.create_image_gles2_tex2d_red
 dEQP-EGL.functional.image.api.create_image_gles2_tex2d_rg
 dEQP-EGL.functional.image.api.create_image_gles2_tex2d_luminance
@@ -2225,6 +2373,33 @@
 dEQP-EGL.functional.negative_api.swap_interval
 dEQP-EGL.functional.negative_api.terminate
 dEQP-EGL.functional.negative_api.wait_native
+dEQP-EGL.functional.fence_sync.valid.create_null_attribs
+dEQP-EGL.functional.fence_sync.valid.create_empty_attribs
+dEQP-EGL.functional.fence_sync.valid.wait_no_timeout
+dEQP-EGL.functional.fence_sync.valid.wait_forever
+dEQP-EGL.functional.fence_sync.valid.wait_no_context
+dEQP-EGL.functional.fence_sync.valid.wait_forever_flush
+dEQP-EGL.functional.fence_sync.valid.get_type
+dEQP-EGL.functional.fence_sync.valid.get_status
+dEQP-EGL.functional.fence_sync.valid.get_status_signaled
+dEQP-EGL.functional.fence_sync.valid.get_condition
+dEQP-EGL.functional.fence_sync.valid.destroy
+dEQP-EGL.functional.fence_sync.valid.wait_server
+dEQP-EGL.functional.fence_sync.invalid.create_invalid_display
+dEQP-EGL.functional.fence_sync.invalid.create_invalid_type
+dEQP-EGL.functional.fence_sync.invalid.create_invalid_attribs
+dEQP-EGL.functional.fence_sync.invalid.create_invalid_context
+dEQP-EGL.functional.fence_sync.invalid.wait_invalid_display
+dEQP-EGL.functional.fence_sync.invalid.wait_invalid_sync
+dEQP-EGL.functional.fence_sync.invalid.get_invalid_display
+dEQP-EGL.functional.fence_sync.invalid.get_invalid_sync
+dEQP-EGL.functional.fence_sync.invalid.get_invalid_attribute
+dEQP-EGL.functional.fence_sync.invalid.get_invalid_value
+dEQP-EGL.functional.fence_sync.invalid.destroy_invalid_display
+dEQP-EGL.functional.fence_sync.invalid.destroy_invalid_sync
+dEQP-EGL.functional.fence_sync.invalid.wait_server_invalid_display
+dEQP-EGL.functional.fence_sync.invalid.wait_server_invalid_sync
+dEQP-EGL.functional.fence_sync.invalid.wait_server_invalid_flag
 dEQP-EGL.functional.multithread.config
 dEQP-EGL.functional.multithread.pbuffer
 dEQP-EGL.functional.multithread.single_window
@@ -2415,6 +2590,7 @@
 dEQP-EGL.functional.get_proc_address.extension.gl_qcom_texture_foveated
 dEQP-EGL.functional.get_proc_address.extension.gl_qcom_shader_framebuffer_fetch_noncoherent
 dEQP-EGL.functional.get_proc_address.core.egl
+dEQP-EGL.functional.get_proc_address.core.egl15
 dEQP-EGL.functional.get_proc_address.core.gles
 dEQP-EGL.functional.get_proc_address.core.gles2
 dEQP-EGL.functional.get_proc_address.core.gles3
@@ -3145,6 +3321,29 @@
 dEQP-EGL.functional.native_coord_mapping.pbuffer_to_native_pixmap.rgba8888_depth_stencil_render
 dEQP-EGL.functional.native_coord_mapping.pbuffer_to_native_pixmap.other_clear
 dEQP-EGL.functional.native_coord_mapping.pbuffer_to_native_pixmap.other_render
+dEQP-EGL.functional.reusable_sync.valid.create_null_attribs
+dEQP-EGL.functional.reusable_sync.valid.create_empty_attribs
+dEQP-EGL.functional.reusable_sync.valid.wait_no_timeout
+dEQP-EGL.functional.reusable_sync.valid.wait_forever
+dEQP-EGL.functional.reusable_sync.valid.wait_no_context
+dEQP-EGL.functional.reusable_sync.valid.wait_forever_flush
+dEQP-EGL.functional.reusable_sync.valid.get_type
+dEQP-EGL.functional.reusable_sync.valid.get_status
+dEQP-EGL.functional.reusable_sync.valid.get_status_signaled
+dEQP-EGL.functional.reusable_sync.valid.destroy
+dEQP-EGL.functional.reusable_sync.invalid.create_invalid_display
+dEQP-EGL.functional.reusable_sync.invalid.create_invalid_type
+dEQP-EGL.functional.reusable_sync.invalid.create_invalid_attribs
+dEQP-EGL.functional.reusable_sync.invalid.wait_invalid_display
+dEQP-EGL.functional.reusable_sync.invalid.wait_invalid_sync
+dEQP-EGL.functional.reusable_sync.invalid.get_invalid_display
+dEQP-EGL.functional.reusable_sync.invalid.get_invalid_sync
+dEQP-EGL.functional.reusable_sync.invalid.get_invalid_attribute
+dEQP-EGL.functional.reusable_sync.invalid.get_invalid_value
+dEQP-EGL.functional.reusable_sync.invalid.destroy_invalid_display
+dEQP-EGL.functional.reusable_sync.invalid.destroy_invalid_sync
+dEQP-EGL.functional.reusable_sync.invalid.wait_server_invalid_display
+dEQP-EGL.functional.reusable_sync.invalid.wait_server_invalid_sync
 dEQP-EGL.functional.resize.surface_size.shrink
 dEQP-EGL.functional.resize.surface_size.grow
 dEQP-EGL.functional.resize.surface_size.stretch_width
diff --git a/android/cts/master/src/egl-temp-excluded.txt b/android/cts/master/src/egl-temp-excluded.txt
index 3b434a7..2974117 100644
--- a/android/cts/master/src/egl-temp-excluded.txt
+++ b/android/cts/master/src/egl-temp-excluded.txt
@@ -1,8 +1 @@
 # Tests to be temporarily skipped for Android CI, but still enforced in CTS.
-
-# b/128983254
-dEQP-EGL.functional.fence_sync.*
-dEQP-EGL.functional.image.api.invalid_create_image
-dEQP-EGL.functional.create_surface.*
-dEQP-EGL.functional.get_proc_address.core.egl15
-dEQP-EGL.functional.reusable_sync.*