summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorAdam Lesinski <adamlesinski@google.com>2015-01-20 22:03:16 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-01-20 22:03:16 +0000
commit43a88535df62b8507717f796df6e46103c4bff95 (patch)
treee4dd77d356d38abe3c5329a7f288640d3d719d99 /include
parent0fa1d70ab1ea160842e59256819fe87e4bbff3ca (diff)
parentd9bd08864eaf9d8847d974eadb81806b9e086a2d (diff)
downloadframeworks_base-43a88535df62b8507717f796df6e46103c4bff95.zip
frameworks_base-43a88535df62b8507717f796df6e46103c4bff95.tar.gz
frameworks_base-43a88535df62b8507717f796df6e46103c4bff95.tar.bz2
am d9bd0886: am aee7225e: Merge "Process base APK" into lmp-mr1-dev automerge: 554a6f5
* commit 'd9bd08864eaf9d8847d974eadb81806b9e086a2d': Process base APK
Diffstat (limited to 'include')
-rw-r--r--include/androidfw/ResourceTypes.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/androidfw/ResourceTypes.h b/include/androidfw/ResourceTypes.h
index de73254..421c5c1 100644
--- a/include/androidfw/ResourceTypes.h
+++ b/include/androidfw/ResourceTypes.h
@@ -1779,7 +1779,7 @@ public:
const DynamicRefTable* getDynamicRefTableForCookie(int32_t cookie) const;
// Return the configurations (ResTable_config) that we know about
- void getConfigurations(Vector<ResTable_config>* configs) const;
+ void getConfigurations(Vector<ResTable_config>* configs, bool ignoreMipmap=false) const;
void getLocales(Vector<String8>* locales) const;