commit b11c1d641535d525a140aac8a9c96cca43a69157
author Ching-Sung Li <chriscsli@google.com> Tue Sep 08 18:09:54 2020 +0800
committer Ching Sung Li <chriscsli@google.com> Tue Sep 08 13:56:25 2020 +0000
tree 985e56a1d5db6f6736af6d14161942408cada910
parent cb187dbd62b7bdcb405252f4ae864d3e273376a0

Remove SurfaceHolder.Callback from SurfaceView's holder

Remove SufraceHolder.Callback from SurfaceView's holder while live
preview fragment is destroyed - the opposite when creating live preview
fragment.

Bug: 167467123
Test: Manual; $ tapas WallpaperPickerGoogleRoboTests; m -j40
Change-Id: If7aa4bad3b70d35ebbc24d26a4227bb83f9ab3e4

src/com/android/wallpaper/picker/LivePreviewFragment.java

diff --git a/src/com/android/wallpaper/picker/LivePreviewFragment.java b/src/com/android/wallpaper/picker/LivePreviewFragment.java
index a28b4a0..d207809 100644
--- a/src/com/android/wallpaper/picker/LivePreviewFragment.java
+++ b/src/com/android/wallpaper/picker/LivePreviewFragment.java
@@ -302,7 +302,9 @@
             mWallpaperConnection = null;
         }
         mWorkspaceSurfaceCallback.cleanUp();
+        mWorkspaceSurface.getHolder().removeCallback(mWorkspaceSurfaceCallback);
         mWallpaperSurfaceCallback.cleanUp();
+        mWallpaperSurface.getHolder().removeCallback(mWallpaperSurfaceCallback);
     }
 
     private void previewLiveWallpaper(ImageView thumbnailView) {