summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libs/androidfw/ZipFileRO.cpp4
-rw-r--r--[-rwxr-xr-x]services/core/java/com/android/server/am/ActivityStack.java0
2 files changed, 4 insertions, 0 deletions
diff --git a/libs/androidfw/ZipFileRO.cpp b/libs/androidfw/ZipFileRO.cpp
index 1ab18ad..a485d2b 100644
--- a/libs/androidfw/ZipFileRO.cpp
+++ b/libs/androidfw/ZipFileRO.cpp
@@ -53,6 +53,10 @@ public:
_ZipEntryRO() : cookie(NULL) {
}
+ ~_ZipEntryRO() {
+ EndIteration(cookie);
+ }
+
private:
_ZipEntryRO(const _ZipEntryRO& other);
_ZipEntryRO& operator=(const _ZipEntryRO& other);
diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java
index 4653742..4653742 100755..100644
--- a/services/core/java/com/android/server/am/ActivityStack.java
+++ b/services/core/java/com/android/server/am/ActivityStack.java