Merge "Add missing clean-up of idmap file descriptors."

cco3 · Android Code Review · commit bcd029b6c8de · 2011-05-05T13:22:18.000-07:00
diff --git a/libs/utils/AssetManager.cpp b/libs/utils/AssetManager.cpp
@@ -680,6 +680,9 @@ const ResTable* AssetManager::getResTable(bool required) const
                 delete ass;
             }
         }
+        if (idmap != NULL) {
+            delete idmap;
+        }
     }
 
     if (required && !rt) LOGW("Unable to find resources file resources.arsc");

Original file line number	Diff line number	Diff line change
`@@ -680,6 +680,9 @@ const ResTable* AssetManager::getResTable(bool required) const`
`680`	`680`	`delete ass;`
`681`	`681`	`}`
`682`	`682`	`}`
	`683`	`+ if (idmap != NULL) {`
	`684`	`+ delete idmap;`
	`685`	`+ }`
`683`	`686`	`}`
`684`	`687`
`685`	`688`	`if (required && !rt) LOGW("Unable to find resources file resources.arsc");`