diff --git a/libs/hwui/renderthread/CanvasContext.cpp b/libs/hwui/renderthread/CanvasContext.cpp
index 93fd0c8..294a6b8 100644
--- a/libs/hwui/renderthread/CanvasContext.cpp
+++ b/libs/hwui/renderthread/CanvasContext.cpp
@@ -565,8 +565,8 @@
     ReliableSurface* surface = mNativeSurface.get();
     if (surface) {
         SkISize size;
-        surface->query(NATIVE_WINDOW_WIDTH, &size.fWidth);
-        surface->query(NATIVE_WINDOW_HEIGHT, &size.fHeight);
+        size.fWidth = ANativeWindow_getWidth(surface);
+        size.fHeight = ANativeWindow_getHeight(surface);
         return size;
     }
     return {INT32_MAX, INT32_MAX};
diff --git a/libs/hwui/tests/unit/SkiaDisplayListTests.cpp b/libs/hwui/tests/unit/SkiaDisplayListTests.cpp
index 6fb164a..7d999c4 100644
--- a/libs/hwui/tests/unit/SkiaDisplayListTests.cpp
+++ b/libs/hwui/tests/unit/SkiaDisplayListTests.cpp
@@ -208,9 +208,8 @@
     test::TestContext testContext;
     testContext.setRenderOffscreen(true);
     auto surface = testContext.surface();
-    int width, height;
-    surface->query(NATIVE_WINDOW_WIDTH, &width);
-    surface->query(NATIVE_WINDOW_HEIGHT, &height);
+    int width = ANativeWindow_getWidth(surface.get());
+    int height = ANativeWindow_getHeight(surface.get());
     canvasContext->setSurface(std::move(surface));
 
     TreeInfo info(TreeInfo::MODE_FULL, *canvasContext.get());