Merge "Gallery2: Fix releasing dualcam object on saving/finishing" into ui_dev_2.0

1 files changed, 4 insertions, 1 deletions

diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
index 37d850fe7..fbb832fd6 100644
--- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java
+++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
@@ -184,6 +184,7 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL
     private DialogInterface mCurrentDialog = null;
     private PopupMenu mCurrentMenu = null;
     private boolean mLoadingVisible = true;
+    private boolean mReleaseDualCamOnDestory = true;
 
     public ProcessingService getProcessingService() {
         return mBoundService;
@@ -942,7 +943,7 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL
         }
         mUserPresetsManager.close();
         doUnbindService();
-        if(DualCameraNativeEngine.getInstance().isLibLoaded())
+        if (mReleaseDualCamOnDestory && DualCameraNativeEngine.getInstance().isLibLoaded())
             DualCameraNativeEngine.getInstance().releaseDepthMap();
         super.onDestroy();
     }
@@ -1451,6 +1452,7 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL
             File saveDir = SaveImage.getFinalSaveDirectory(this, mSelectedImageUri);
             int bucketId = GalleryUtils.getBucketId(saveDir.getPath());
             String albumName = LocalAlbum.getLocalizedName(getResources(), bucketId, null);
+            mReleaseDualCamOnDestory = false;
             showSavingProgress(albumName);
             mImageShow.saveImage(this, null);
         } else {
@@ -1464,6 +1466,7 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL
         if (mLoadBitmapTask != null) {
             mLoadBitmapTask.cancel(false);
         }
+        mReleaseDualCamOnDestory = true;
         finish();
     }