diff options
author | Narayan Kamath <narayan@google.com> | 2014-07-01 10:43:41 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-07-01 10:43:41 +0000 |
commit | c7400b0ce66e916cf8be239c26cd5acbd15ef745 (patch) | |
tree | b585283edc9daa4921bb737d3251c976a3fde58f /libs/androidfw | |
parent | 374041a63dffb49dae89ab9959c96b50f4db98e9 (diff) | |
parent | 8c1c0a6881b1507f9ae25d753b64de185a7615b2 (diff) | |
download | frameworks_base-c7400b0ce66e916cf8be239c26cd5acbd15ef745.zip frameworks_base-c7400b0ce66e916cf8be239c26cd5acbd15ef745.tar.gz frameworks_base-c7400b0ce66e916cf8be239c26cd5acbd15ef745.tar.bz2 |
am 8c1c0a68: am 7f319c47: am 1dc550fa: Merge "Fix packing of values at offset 16."
* commit '8c1c0a6881b1507f9ae25d753b64de185a7615b2':
Fix packing of values at offset 16.
Diffstat (limited to 'libs/androidfw')
-rw-r--r-- | libs/androidfw/ResourceTypes.cpp | 6 | ||||
-rw-r--r-- | libs/androidfw/tests/ResourceTypes_test.cpp | 24 |
2 files changed, 27 insertions, 3 deletions
diff --git a/libs/androidfw/ResourceTypes.cpp b/libs/androidfw/ResourceTypes.cpp index 2e3abb5..2889ea3 100644 --- a/libs/androidfw/ResourceTypes.cpp +++ b/libs/androidfw/ResourceTypes.cpp @@ -1719,9 +1719,9 @@ void ResTable_config::copyFromDeviceNoSwap(const ResTable_config& o) { out[0] = in[0]; out[1] = in[1]; } else { - uint8_t first = (in[0] - base) & 0x00ef; - uint8_t second = (in[1] - base) & 0x00ef; - uint8_t third = (in[2] - base) & 0x00ef; + uint8_t first = (in[0] - base) & 0x007f; + uint8_t second = (in[1] - base) & 0x007f; + uint8_t third = (in[2] - base) & 0x007f; out[0] = (0x80 | (third << 2) | (second >> 3)); out[1] = ((second << 5) | first); diff --git a/libs/androidfw/tests/ResourceTypes_test.cpp b/libs/androidfw/tests/ResourceTypes_test.cpp index 6041e08..f00a2d9 100644 --- a/libs/androidfw/tests/ResourceTypes_test.cpp +++ b/libs/androidfw/tests/ResourceTypes_test.cpp @@ -75,6 +75,30 @@ TEST(ResourceTypesTest, ResourceConfig_packAndUnpack3LetterLanguage) { EXPECT_EQ(0, out[3]); } +TEST(ResourceTypesTest, ResourceConfig_packAndUnpack3LetterLanguageAtOffset16) { + ResTable_config config; + config.packLanguage("tgp"); + + // We had a bug where we would accidentally mask + // the 5th bit of both bytes + // + // packed[0] = 1011 1100 + // packed[1] = 1101 0011 + // + // which is equivalent to: + // 1 [0] [1] [2] + // 1-01111-00110-10011 + EXPECT_EQ(0xbc, config.language[0]); + EXPECT_EQ(0xd3, config.language[1]); + + char out[4] = { 1, 1, 1, 1}; + config.unpackLanguage(out); + EXPECT_EQ('t', out[0]); + EXPECT_EQ('g', out[1]); + EXPECT_EQ('p', out[2]); + EXPECT_EQ(0, out[3]); +} + TEST(ResourceTypesTest, ResourceConfig_packAndUnpack3LetterRegion) { ResTable_config config; config.packRegion("419"); |