From 7cdb3e3e2dad1d48d666fe44e37e724341a2c507 Mon Sep 17 00:00:00 2001 From: Roozbeh Pournader Date: Fri, 22 Jan 2016 14:44:53 -0800 Subject: [PATCH] Move localeScriptWasProvided to end of ResTable_config This is to try and be safer with different versions potentially interpreting the data differently. Change-Id: I599b6a20d908e8379727a5b06cc6631f1954bcff --- include/androidfw/ResourceTypes.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/include/androidfw/ResourceTypes.h b/include/androidfw/ResourceTypes.h index 88fecceff5fb3..d8801b8709ee5 100644 --- a/include/androidfw/ResourceTypes.h +++ b/include/androidfw/ResourceTypes.h @@ -1128,7 +1128,6 @@ struct ResTable_config // configuration. (eg. Hant, Latn, etc.). Interpreted in conjunction with // the locale field. char localeScript[4]; - bool localeScriptWasProvided; // A single BCP-47 variant subtag. Will vary in length between 4 and 8 // chars. Interpreted in conjunction with the locale field. @@ -1152,6 +1151,10 @@ struct ResTable_config uint32_t screenConfig2; }; + // If true, it means that the script of the locale was explicitly provided. + // If false, it means that the script was automatically computed. + bool localeScriptWasProvided; + void copyFromDeviceNoSwap(const ResTable_config& o); void copyFromDtoH(const ResTable_config& o);