summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorAdam Lesinski <adamlesinski@google.com>2015-01-20 21:55:12 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-01-20 21:55:12 +0000
commitd9bd08864eaf9d8847d974eadb81806b9e086a2d (patch)
tree7f3f1caed8501f6409955deb27db6fa211fbca62 /include
parenta9c122af60621597f1d008c8a283074309383aac (diff)
parent554a6f5278ec05077d8252249afc911897fbfe76 (diff)
downloadframeworks_base-d9bd08864eaf9d8847d974eadb81806b9e086a2d.zip
frameworks_base-d9bd08864eaf9d8847d974eadb81806b9e086a2d.tar.gz
frameworks_base-d9bd08864eaf9d8847d974eadb81806b9e086a2d.tar.bz2
am aee7225e: Merge "Process base APK" into lmp-mr1-dev
automerge: 554a6f5 * commit '554a6f5278ec05077d8252249afc911897fbfe76': 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;