Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7cdb3e3e authored by Roozbeh Pournader's avatar Roozbeh Pournader
Browse files

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
parent ac7c606c

include/androidfw/ResourceTypes.h

+4 −1
Original line number Diff line number Diff line
@@ -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);