diff --git a/src/android/jar/src/org/qtproject/qt/android/QtSurface.java b/src/android/jar/src/org/qtproject/qt/android/QtSurface.java
index c65c57c7113..54474c9f3d0 100644
--- a/src/android/jar/src/org/qtproject/qt/android/QtSurface.java
+++ b/src/android/jar/src/org/qtproject/qt/android/QtSurface.java
@@ -22,11 +22,9 @@ class QtSurface extends SurfaceView implements SurfaceHolder.Callback
         setFocusableInTouchMode(false);
         setZOrderMediaOverlay(onTop);
         m_surfaceCallback = surfaceCallback;
-        getHolder().addCallback(this);
-        if (imageDepth == 16)
-            getHolder().setFormat(PixelFormat.RGB_565);
-        else
-            getHolder().setFormat(PixelFormat.RGBA_8888);
+        SurfaceHolder holder = getHolder();
+        holder.setFormat(imageDepth == 16 ? PixelFormat.RGB_565 : PixelFormat.RGBA_8888);
+        holder.addCallback(this);
     }
 
     @Override