diff --git a/core/jni/android_view_Surface.cpp b/core/jni/android_view_Surface.cpp
index f0f214c8c0f4b..b4a19f103eb6f 100644
--- a/core/jni/android_view_Surface.cpp
+++ b/core/jni/android_view_Surface.cpp
@@ -116,8 +116,8 @@ jobject android_view_Surface_createFromIGraphicBufferProducer(JNIEnv* env,
 
 // ----------------------------------------------------------------------------
 
-static bool isSurfaceValid(const sp<Surface>& sur) {
-    return sur != 0 && sur->getISurfaceTexture() != 0;
+static inline bool isSurfaceValid(const sp<Surface>& sur) {
+    return Surface::isValid(sur);
 }
 
 // ----------------------------------------------------------------------------