Fix activity stack when restarting the screen nailcm-10.1.2cm-10.1.1cm-10.1.0-RC5cm-10.1.0-RC4cm-10.1.0-RC3cm-10.1.0

We were stacking multiple activities, resulting in the need for multiple
destructions (back key events) when killing the camera app

Change-Id: I7ec61c517d25f7e47baf47fcd1696f987631c344

1 files changed, 4 insertions, 0 deletions

diff --git a/src/com/android/gallery3d/app/StateManager.java b/src/com/android/gallery3d/app/StateManager.java
index fa7d857ba..4f0b1965c 100644
--- a/src/com/android/gallery3d/app/StateManager.java
+++ b/src/com/android/gallery3d/app/StateManager.java
@@ -84,6 +84,10 @@ public class StateManager {
         }
         state.initialize(mActivity, data);
 
+        if (!mStack.isEmpty()) {
+            mStack.pop();
+        }
+
         mStack.push(new StateEntry(data, state));
         state.onCreate(data, null);
         if (mIsResumed) state.resume();