diff options
| author | Ricardo Cerqueira <github@cerqueira.org> | 2012-05-05 18:49:09 +0100 |
|---|---|---|
| committer | Ricardo Cerqueira <github@cerqueira.org> | 2012-05-05 18:49:17 +0100 |
| commit | e821f5b727ef247a789557badb6640880cf992dd (patch) | |
| tree | fc74bf9cc07a3eac04166477bed32ee5f9583d40 /tools/aapt/ResourceTable.cpp | |
| parent | f0b7008ac173a4402b982b0f50ca3db8b0659bb7 (diff) | |
| parent | fd6ee4e7d2f1600021c0d2f47914c01600bd1b97 (diff) | |
| download | frameworks_base-e821f5b727ef247a789557badb6640880cf992dd.zip frameworks_base-e821f5b727ef247a789557badb6640880cf992dd.tar.gz frameworks_base-e821f5b727ef247a789557badb6640880cf992dd.tar.bz2 | |
Merge branch 'themes-4.0' into 'ics'
Change-Id: Idc363f8140be2d252bee2aeba46c944032fb0ae9
Diffstat (limited to 'tools/aapt/ResourceTable.cpp')
| -rw-r--r-- | tools/aapt/ResourceTable.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/tools/aapt/ResourceTable.cpp b/tools/aapt/ResourceTable.cpp index fdb39ca..df117db 100644 --- a/tools/aapt/ResourceTable.cpp +++ b/tools/aapt/ResourceTable.cpp @@ -1,5 +1,6 @@ // // Copyright 2006 The Android Open Source Project +// This code has been modified. Portions copyright (C) 2010, T-Mobile USA, Inc. // // Build resource files from raw assets. // @@ -3620,7 +3621,16 @@ sp<ResourceTable::Package> ResourceTable::getPackage(const String16& package) mHaveAppPackage = true; p = new Package(package, 127); } else { - p = new Package(package, mNextPackageId); + int extendedPackageId = mBundle->getExtendedPackageId(); + if (extendedPackageId != 0) { + if ((uint32_t)extendedPackageId < mNextPackageId) { + fprintf(stderr, "Package ID %d already in use!\n", mNextPackageId); + return NULL; + } + p = new Package(package, extendedPackageId); + } else { + p = new Package(package, mNextPackageId); + } } //printf("*** NEW PACKAGE: \"%s\" id=%d\n", // String8(package).string(), p->getAssignedId()); |