1 files changed, 8 insertions, 0 deletions
diff --git a/src/com/android/camera/ActivityBase.java b/src/com/android/camera/ActivityBase.java
index 5839668..96d7331 100644
--- a/src/com/android/camera/ActivityBase.java
+++ b/src/com/android/camera/ActivityBase.java
@@ -16,6 +16,8 @@
 
 package com.android.camera;
 
+import com.android.camera.ui.PopupManager;
+
 import android.app.Activity;
 import android.view.KeyEvent;
 import android.content.Intent;
@@ -61,4 +63,10 @@ public class ActivityBase extends Activity {
     public Intent getResultData() {
         return mResultDataForTesting;
     }
+
+    @Override
+    protected void onDestroy() {
+        PopupManager.removeInstance(this);
+        super.onDestroy();
+    }
 }