Update OMS patches

[GitHub/Stricted/android_vendor_extra.git] / patches / frameworks / base / 0006-OMS7-N-Fix-memory-leak-during-idmap-creation-6-11.patch

diff --git a/patches/frameworks/base/0006-OMS7-N-Fix-memory-leak-during-idmap-creation-6-11.patch b/patches/frameworks/base/0006-OMS7-N-Fix-memory-leak-during-idmap-creation-6-11.patch
index 5dc8f7ef8d9be34d99b9ce9207ed98bc9b495d1b..b20a9554619cc052155e4db45c4dce8e1f99f27e 100644 (file)
--- a/patches/frameworks/base/0006-OMS7-N-Fix-memory-leak-during-idmap-creation-6-11.patch
+++ b/patches/frameworks/base/0006-OMS7-N-Fix-memory-leak-during-idmap-creation-6-11.patch
@@ -1,7 +1,7 @@
-From a40cb29e8ce6822cc93df52d1ed39d42fcacf402 Mon Sep 17 00:00:00 2001
+From 8cd407e5c0fb8390c7a9cfe2b4833d3fd88f3f08 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?M=C3=A5rten=20Kongstad?= <marten.kongstad@sonymobile.com>
 Date: Thu, 2 Jun 2016 09:34:36 +0200
-Subject: [PATCH 06/44] OMS7-N: Fix memory leak during idmap creation [6/11]
+Subject: [PATCH 06/52] OMS7-N: Fix memory leak during idmap creation [6/11]
 
 Plug a memory leak in AssetManager::createIdmap.
 
@@ -11,10 +11,10 @@ Change-Id: Ieed805c596df931e2167ebb47c1b2907d6bf67f4
  1 file changed, 25 insertions(+), 13 deletions(-)
 
 diff --git a/libs/androidfw/AssetManager.cpp b/libs/androidfw/AssetManager.cpp
-index b995457..ef580e3 100644
+index 5eae1459444..8669f243fee 100644
 --- a/libs/androidfw/AssetManager.cpp
 +++ b/libs/androidfw/AssetManager.cpp
-@@ -291,22 +291,34 @@ bool AssetManager::createIdmap(const char* targetApkPath, const char* overlayApk
+@@ -292,22 +292,34 @@ bool AssetManager::createIdmap(const char* targetApkPath, const char* overlayApk
  {
      AutoMutex _l(mLock);
      const String8 paths[2] = { String8(targetApkPath), String8(overlayApkPath) };
@@ -63,5 +63,5 @@ index b995457..ef580e3 100644
  
  bool AssetManager::addDefaultAssets()
 -- 
-2.9.3
+2.11.1