diff --git a/src/com/android/customization/picker/grid/GridOptionPreviewer.java b/src/com/android/customization/picker/grid/GridOptionPreviewer.java
index 47303e9..fdefa05 100644
--- a/src/com/android/customization/picker/grid/GridOptionPreviewer.java
+++ b/src/com/android/customization/picker/grid/GridOptionPreviewer.java
@@ -17,7 +17,6 @@
 
 import android.content.Context;
 import android.os.Bundle;
-import android.view.Surface;
 import android.view.SurfaceHolder;
 import android.view.SurfaceView;
 import android.view.ViewGroup;
@@ -54,11 +53,6 @@
     public void release() {
         if (mGridOptionSurface != null) {
             mSurfaceCallback.cleanUp();
-            mGridOptionSurface.getHolder().removeCallback(mSurfaceCallback);
-            Surface surface = mGridOptionSurface.getHolder().getSurface();
-            if (surface != null) {
-                surface.release();
-            }
             mGridOptionSurface = null;
         }
         mPreviewContainer.removeAllViews();