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

Commit fc32a062 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change I88721afe into eclair-mr2

* changes:
  Fix bitmask in aapt's StringPool length construction
parents 30d90523 88721afe
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -228,7 +228,7 @@ status_t StringPool::writeStringBlock(const sp<AaptFile>& pool)
        }
        dat += (preSize+strPos)/sizeof(uint16_t);
        if (lenSize > sizeof(uint16_t)) {
            *dat = htods(0x8000 | ((strSize>>16)&0x7ffff));
            *dat = htods(0x8000 | ((strSize>>16)&0x7fff));
            dat++;
        }
        *dat++ = htods(strSize);