From 195b23ef712c51dc8d2f3a1f1943a27054dc4e74 Mon Sep 17 00:00:00 2001
From: Nick Kralevich <nnk@google.com>
Date: Fri, 13 Jun 2014 16:24:58 -0700
Subject: [PATCH 1/2] update mLastSlash for gdbserver

the gdbserver special case wasn't updating mLastSlash. Fix it.

Change-Id: I63d64bb5f543bd2df6183649cf727e830731e144
---
 core/jni/com_android_internal_content_NativeLibraryHelper.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/jni/com_android_internal_content_NativeLibraryHelper.cpp b/core/jni/com_android_internal_content_NativeLibraryHelper.cpp
index 8cb897e629a84..1722138ec9154 100644
--- a/core/jni/com_android_internal_content_NativeLibraryHelper.cpp
+++ b/core/jni/com_android_internal_content_NativeLibraryHelper.cpp
@@ -327,6 +327,7 @@ public:
 
             // Exception: If we find the gdbserver binary, return it.
             if (!strncmp(lastSlash + 1, GDBSERVER, GDBSERVER_LEN)) {
+                mLastSlash = lastSlash;
                 break;
             }
 

From 7c57d2337150ab52c148d30d9126f3b99ca951b4 Mon Sep 17 00:00:00 2001
From: sean_lu <sean_lu@htc.com>
Date: Mon, 16 Jun 2014 15:11:29 +0800
Subject: [PATCH 2/2] [Asset Manager] Fix memory leakage bug

Symptom: memory leakage
Root Cause: new SortedVector but not free it in native cpp
Solution: free the SortedVector
Project: AOSP
Note:

Change-Id: Iab5a7f2e8d8509631301e7231427927d4797c856
---
 libs/androidfw/AssetManager.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libs/androidfw/AssetManager.cpp b/libs/androidfw/AssetManager.cpp
index b4d482ad0a547..87164ca2f5aa0 100644
--- a/libs/androidfw/AssetManager.cpp
+++ b/libs/androidfw/AssetManager.cpp
@@ -1747,6 +1747,7 @@ bool AssetManager::fncScanAndMergeDirLocked(
     }
 
     mergeInfoLocked(pMergedInfo, pContents);
+    delete pContents;
     return true;
 }