drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 1dc550fa: Merge "Fix packing of values at offset 16."

Browse Source 
* commit '1dc550fa7333257a130d71866be37181f8ee553b':
  Fix packing of values at offset 16.
This commit is contained in:
Narayan Kamath
2014-07-01 09:22:10 +00:00
committed by Android Git Automerger
parent 89e4c715e0 1dc550fa73
commit 7f319c47c8
2 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libs/androidfw/ResourceTypes.cpp
View File

@ -1597,9 +1597,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);

24
libs/androidfw/tests/ResourceTypes_test.cpp
View File

@ -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");