From: The Android Open Source Project Date: Tue, 29 Jun 2010 21:42:32 +0000 (-0700) Subject: am 799a5a61: am 2533a6ad: set up fast-forward from froyo-release to gingerbread X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/f68488ad414c4e47e47c66c4041a8178dbbaff16?hp=edacf88c80e6d421cc3542268a263b9fa9e13a7f am 799a5a61: am 2533a6ad: set up fast-forward from froyo-release to gingerbread Merge commit '799a5a61d5813be83c4d0814b04c374adfe3a989' * commit '799a5a61d5813be83c4d0814b04c374adfe3a989': (22 commits) Properly note the current active restore set's token Do not log AT command traffic by default. Work on issue # 2778549: Idle FRF72 is awake 18 mins more than ERE27 in 13hr test TimedEventQueue is apparently important for glitch-free media playback, and so As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files When filling the cache, we always time out waiting for a condition that won't occur. Respond to changes in throttle policy. Fix Tethering of multiple downstream ifaces. Update Framework to support multiple dhpc ranges Dumb late-night typo. Use ViewRoot.addConfigCallback instead of a BroadcastReceiver. Clean up changing AP configuration Grant permissions to apps on sd when enabling/disabling packages. Fix issue #2512507: Shortcuts and Widgets lost on upgrading from Eclair to FRE70D Switch default install location to unspecified. Fix problem with calling onConfigurationChanged() too much. Preserve widgets on upgrade. Need to keep new package's cert when using original-package. Pick up default install location Fix 2463886: Allow delayed fetching of DevicePolicyManager in LockPatternUtils. ... --- diff --git a/Command.cpp b/Command.cpp index 83057b8..c40af80 100644 --- a/Command.cpp +++ b/Command.cpp @@ -197,8 +197,10 @@ int doList(Bundle* bundle) if (&res == NULL) { printf("\nNo resource table found.\n"); } else { +#ifndef HAVE_ANDROID_OS printf("\nResource table:\n"); res.print(false); +#endif } Asset* manifestAsset = assets.openNonAsset("AndroidManifest.xml", @@ -388,8 +390,9 @@ int doDump(Bundle* bundle) } if (strcmp("resources", option) == 0) { +#ifndef HAVE_ANDROID_OS res.print(bundle->getValues()); - +#endif } else if (strcmp("xmltree", option) == 0) { if (bundle->getFileSpecCount() < 3) { fprintf(stderr, "ERROR: no dump xmltree resource file specified\n"); diff --git a/Package.cpp b/Package.cpp index 999a5cf..3cb614f 100644 --- a/Package.cpp +++ b/Package.cpp @@ -441,7 +441,7 @@ ssize_t processJarFile(ZipFile* jar, ZipFile* out) ssize_t processJarFiles(Bundle* bundle, ZipFile* zip) { - ssize_t err; + status_t err; ssize_t count = 0; const android::Vector& jars = bundle->getJarFiles(); diff --git a/Resource.cpp b/Resource.cpp index cafd635..5855b56 100644 --- a/Resource.cpp +++ b/Resource.cpp @@ -542,11 +542,11 @@ static bool applyFileOverlay(Bundle *bundle, DefaultKeyedVector > baseFiles = baseGroup->getFiles(); for (size_t i=0; i < baseFiles.size(); i++) { - printf("baseFile %ld has flavor %s\n", i, + printf("baseFile %d has flavor %s\n", i, baseFiles.keyAt(i).toString().string()); } for (size_t i=0; i < overlayFiles.size(); i++) { - printf("overlayFile %ld has flavor %s\n", i, + printf("overlayFile %d has flavor %s\n", i, overlayFiles.keyAt(i).toString().string()); } } @@ -560,7 +560,7 @@ static bool applyFileOverlay(Bundle *bundle, keyAt(overlayGroupIndex)); if(baseFileIndex < UNKNOWN_ERROR) { if (bundle->getVerbose()) { - printf("found a match (%ld) for overlay file %s, for flavor %s\n", + printf("found a match (%d) for overlay file %s, for flavor %s\n", baseFileIndex, overlayGroup->getLeaf().string(), overlayFiles.keyAt(overlayGroupIndex).toString().string()); diff --git a/ResourceTable.cpp b/ResourceTable.cpp index 755b93b..f40a877 100644 --- a/ResourceTable.cpp +++ b/ResourceTable.cpp @@ -2366,7 +2366,7 @@ ResourceTable::validateLocalizations(void) if (configSet.count(defaultLocale) == 0) { fprintf(stdout, "aapt: warning: string '%s' has no default translation in %s; found:", String8(nameIter->first).string(), mBundle->getResourceSourceDirs()[0]); - for (set::iterator locales = configSet.begin(); + for (set::const_iterator locales = configSet.begin(); locales != configSet.end(); locales++) { fprintf(stdout, " %s", (*locales).string()); diff --git a/StringPool.cpp b/StringPool.cpp index a09cec0..e28bdff 100644 --- a/StringPool.cpp +++ b/StringPool.cpp @@ -30,7 +30,7 @@ void printStringPool(const ResStringPool* pool) str = String8(pool->stringAt(s, &len)).string(); } - printf("String #%ld: %s\n", s, str); + printf("String #%d: %s\n", s, str); } } diff --git a/XMLNode.cpp b/XMLNode.cpp index 57ff47a..452549b 100644 --- a/XMLNode.cpp +++ b/XMLNode.cpp @@ -203,9 +203,13 @@ status_t parseStyledString(Bundle* bundle, } } if (xliffDepth == 0 && pseudolocalize) { +#ifdef ENABLE_PSEUDOLOCALIZE std::string orig(String8(text).string()); std::string pseudo = pseudolocalize_string(orig); curString.append(String16(String8(pseudo.c_str()))); +#else + assert(false); +#endif } else { if (isFormatted && hasSubstitutionErrors(fileName, inXml, text) != NO_ERROR) { return UNKNOWN_ERROR; diff --git a/ZipFile.h b/ZipFile.h index dbbd072..7877550 100644 --- a/ZipFile.h +++ b/ZipFile.h @@ -57,7 +57,7 @@ public: /* * Open a new or existing archive. */ - typedef enum { + enum { kOpenReadOnly = 0x01, kOpenReadWrite = 0x02, kOpenCreate = 0x04, // create if it doesn't exist