Gallery2: fix memory leak and reduce memory use

Clear references to FilterShowActivity and reset singleton MasterImage
when exiting FilterShowActivity. Wait for saving task to complete before
exiting FilterShowActivity to resolve issue of re-entering activity
while previous image save task is still running. Do not upscale border
assets to reduce memory footprint.

Change-Id: If17479db2ae78955c15e95f72588e32019177bb9
CRs-Fixed: 929338

1 files changed, 0 insertions, 11 deletions

diff --git a/src/com/thundersoft/hz/selfportrait/makeup/engine/MakeupEngine.java b/src/com/thundersoft/hz/selfportrait/makeup/engine/MakeupEngine.java
index 8d58bcfef..d33dc7f91 100644
--- a/src/com/thundersoft/hz/selfportrait/makeup/engine/MakeupEngine.java
+++ b/src/com/thundersoft/hz/selfportrait/makeup/engine/MakeupEngine.java
@@ -17,7 +17,6 @@
 
 package com.thundersoft.hz.selfportrait.makeup.engine;
 
-import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.Rect;
 import android.util.Log;
@@ -46,16 +45,6 @@ public class MakeupEngine {
         return mInstance;
     }
 
-    private Context mContext;
-
-    public void setContext(Context context) {
-        mContext = context;
-    }
-
-    public Context getContext() {
-        return mContext;
-    }
-
     /**
      * FUNCTION: doProcessBeautify
      * Do process face region clean and whiten.