From b6c3e53c9982ccab438a2a64bf1b0b4e9b42fdc1 Mon Sep 17 00:00:00 2001 From: Josh Guilfoyle Date: Fri, 4 Feb 2011 11:22:05 -0800 Subject: Corrected whitespace trespasses. Many small whitespace mistakes slipped into the framework as the themes feature was developed. This patch reverts them to make a cleaner patch set against android-2.3.1_r1. Change-Id: I52223c1d572d4f013e37bebc5c11bb7b1c595eb3 --- core/java/android/app/ActivityThread.java | 4 +- core/java/android/app/ContextImpl.java | 3 +- core/java/android/content/Intent.java | 2 +- core/java/android/content/pm/ActivityInfo.java | 2 +- core/java/android/content/pm/PackageManager.java | 2 +- core/java/android/content/pm/ThemeInfo.java | 1 - core/java/android/content/res/AssetManager.java | 4 +- .../android/content/res/CompatibilityInfo.java | 2 +- core/java/android/content/res/Configuration.java | 4 +- core/java/android/widget/LinearLayout.java | 2 +- core/jni/android_util_AssetManager.cpp | 154 ++++++++++----------- include/utils/AssetManager.h | 18 +-- include/utils/ResourceTypes.h | 2 +- libs/utils/AssetManager.cpp | 20 +-- media/java/android/media/Ringtone.java | 4 +- media/java/android/media/RingtoneManager.java | 6 +- .../com/android/server/PackageManagerService.java | 4 +- 17 files changed, 116 insertions(+), 118 deletions(-) diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index 0838f61..08d9f8e 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -1210,13 +1210,13 @@ public final class ActivityThread { // Slog.w(TAG, "Throwing away out-of-date resources!!!! " // + r + " " + resDir); //} - + AssetManager assets = new AssetManager(); assets.setThemeSupport(compInfo.isThemeable); if (assets.addAssetPath(resDir) == 0) { return null; } - + /* Attach theme information to the resulting AssetManager when appropriate. */ Configuration config = getConfiguration(); if (compInfo.isThemeable && config != null) { diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java index 27709c2..af7f4bd 100644 --- a/core/java/android/app/ContextImpl.java +++ b/core/java/android/app/ContextImpl.java @@ -292,14 +292,13 @@ class ContextImpl extends Context { public void setTheme(int resid) { mThemeResource = resid; } - + @Override public Resources.Theme getTheme() { if (mTheme == null) { if (mThemeResource == 0) { mThemeResource = com.android.internal.R.style.Theme; } - mTheme = mResources.newTheme(); mTheme.applyStyle(mThemeResource, true); } diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index 9c7a863..96415c0 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -2069,7 +2069,7 @@ public class Intent implements Parcelable, Cloneable { /** * Used to indicate that a theme package has been installed or un-installed. - * + * * @hide */ public static final String CATEGORY_THEME_PACKAGE_INSTALLED_STATE_CHANGE = diff --git a/core/java/android/content/pm/ActivityInfo.java b/core/java/android/content/pm/ActivityInfo.java index 819758f..31a9a4e 100644 --- a/core/java/android/content/pm/ActivityInfo.java +++ b/core/java/android/content/pm/ActivityInfo.java @@ -344,7 +344,7 @@ public class ActivityInfo extends ComponentInfo * the mode from the theme will be used. */ public int softInputMode; - + public ActivityInfo() { } diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index 88c7e62..42495be 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -1176,7 +1176,7 @@ public abstract class PackageManager { * * @return A List of PackageInfo objects, one for each theme package * that is installed on the device. - * + * * @hide */ public abstract List getInstalledThemePackages(); diff --git a/core/java/android/content/pm/ThemeInfo.java b/core/java/android/content/pm/ThemeInfo.java index 8b9415c..e51dbb6 100644 --- a/core/java/android/content/pm/ThemeInfo.java +++ b/core/java/android/content/pm/ThemeInfo.java @@ -39,7 +39,6 @@ import android.content.res.Resources; * pluto:ringtoneFileName="media/audio/ringtone.mp3" * pluto:notificationRingtoneFileName="media/audio/locked/notification.mp3" * pluto:copyright="T-Mobile, 2009" - * pluto:wallpaperImage="media/images/wallpaper.jpg" * /> * * @hide diff --git a/core/java/android/content/res/AssetManager.java b/core/java/android/content/res/AssetManager.java index 0b8c3ab..fffe354 100644 --- a/core/java/android/content/res/AssetManager.java +++ b/core/java/android/content/res/AssetManager.java @@ -659,8 +659,8 @@ public final class AssetManager { /** * Delete a set of assets from the asset manager. Not for use by - * applications. Returns true if succeeded or false on failure. {@hide - * } + * applications. Returns true if succeeded or false on failure. + * {@hide} */ public native final boolean removeAssetPath(String packageName, int cookie); diff --git a/core/java/android/content/res/CompatibilityInfo.java b/core/java/android/content/res/CompatibilityInfo.java index 4cad437..9854b89 100644 --- a/core/java/android/content/res/CompatibilityInfo.java +++ b/core/java/android/content/res/CompatibilityInfo.java @@ -140,7 +140,7 @@ public class CompatibilityInfo { * Whether the application supports third-party theming. */ public final boolean isThemeable; - + public CompatibilityInfo(ApplicationInfo appInfo) { isThemeable = appInfo.isThemeable; appFlags = appInfo.flags; diff --git a/core/java/android/content/res/Configuration.java b/core/java/android/content/res/Configuration.java index a765fb0..50a1e14 100644 --- a/core/java/android/content/res/Configuration.java +++ b/core/java/android/content/res/Configuration.java @@ -179,7 +179,7 @@ public final class Configuration implements Parcelable, ComparableopenFileDescriptor(&startOffset, &length); delete a; - + if (fd < 0) { jniThrowException(env, "java/io/FileNotFoundException", "This file can not be opened as a file descriptor; it is probably compressed"); return NULL; } - + jlong* offsets = (jlong*)env->GetPrimitiveArrayCritical(outOffsets, 0); if (offsets == NULL) { close(fd); return NULL; } - + offsets[0] = startOffset; offsets[1] = length; - + env->ReleasePrimitiveArrayCritical(outOffsets, offsets, 0); - + jobject fileDesc = newFileDescriptor(env, fd); if (fileDesc == NULL) { close(fd); return NULL; } - + return newParcelFileDescriptor(env, fileDesc); } @@ -388,7 +388,7 @@ static jint android_content_AssetManager_readAsset(JNIEnv* env, jobject clazz, if (len == 0) { return 0; } - + jsize bLen = env->GetArrayLength(bArray); if (off < 0 || off >= bLen || len < 0 || len > bLen || (off+len) > bLen) { jniThrowException(env, "java/lang/IndexOutOfBoundsException", ""); @@ -547,9 +547,9 @@ static void android_content_AssetManager_setConfiguration(JNIEnv* env, jobject c ResTable_config config; memset(&config, 0, sizeof(config)); - + const char* locale8 = locale != NULL ? env->GetStringUTFChars(locale, NULL) : NULL; - + config.mcc = (uint16_t)mcc; config.mnc = (uint16_t)mnc; config.orientation = (uint8_t)orientation; @@ -565,7 +565,7 @@ static void android_content_AssetManager_setConfiguration(JNIEnv* env, jobject c config.sdkVersion = (uint16_t)sdkVersion; config.minorVersion = 0; am->setConfiguration(config, locale8); - + if (locale != NULL) env->ReleaseStringUTFChars(locale, locale8); } @@ -616,12 +616,12 @@ static jstring android_content_AssetManager_getResourceName(JNIEnv* env, jobject if (am == NULL) { return NULL; } - + ResTable::resource_name name; if (!am->getResources().getResourceName(resid, &name)) { return NULL; } - + String16 str; if (name.package != NULL) { str.setTo(name.package, name.packageLen); @@ -640,7 +640,7 @@ static jstring android_content_AssetManager_getResourceName(JNIEnv* env, jobject } str.append(name.name, name.nameLen); } - + return env->NewString((const jchar*)str.string(), str.size()); } @@ -651,16 +651,16 @@ static jstring android_content_AssetManager_getResourcePackageName(JNIEnv* env, if (am == NULL) { return NULL; } - + ResTable::resource_name name; if (!am->getResources().getResourceName(resid, &name)) { return NULL; } - + if (name.package != NULL) { return env->NewString((const jchar*)name.package, name.packageLen); } - + return NULL; } @@ -671,16 +671,16 @@ static jstring android_content_AssetManager_getResourceTypeName(JNIEnv* env, job if (am == NULL) { return NULL; } - + ResTable::resource_name name; if (!am->getResources().getResourceName(resid, &name)) { return NULL; } - + if (name.type != NULL) { return env->NewString((const jchar*)name.type, name.typeLen); } - + return NULL; } @@ -691,16 +691,16 @@ static jstring android_content_AssetManager_getResourceEntryName(JNIEnv* env, jo if (am == NULL) { return NULL; } - + ResTable::resource_name name; if (!am->getResources().getResourceName(resid, &name)) { return NULL; } - + if (name.name != NULL) { return env->NewString((const jchar*)name.name, name.nameLen); } - + return NULL; } @@ -753,10 +753,10 @@ static jint android_content_AssetManager_loadResourceBagValue(JNIEnv* env, jobje return 0; } const ResTable& res(am->getResources()); - + // Now lock down the resource object and start pulling stuff from it. res.lock(); - + ssize_t block = -1; Res_value value; @@ -777,7 +777,7 @@ static jint android_content_AssetManager_loadResourceBagValue(JNIEnv* env, jobje if (block < 0) { return block; } - + uint32_t ref = ident; if (resolve) { block = res.resolveReference(&value, block, &ref, &typeSpecFlags); @@ -888,21 +888,21 @@ static void android_content_AssetManager_dumpTheme(JNIEnv* env, jobject clazz, { ResTable::Theme* theme = (ResTable::Theme*)themeInt; const ResTable& res(theme->getResTable()); - + if (tag == NULL) { jniThrowException(env, "java/lang/NullPointerException", "tag"); return; } - + const char* tag8 = env->GetStringUTFChars(tag, NULL); const char* prefix8 = NULL; if (prefix != NULL) { prefix8 = env->GetStringUTFChars(prefix, NULL); } - + // XXX Need to use params. theme->dumpToLog(); - + if (prefix8 != NULL) { env->ReleaseStringUTFChars(prefix, prefix8); } @@ -1173,12 +1173,12 @@ static jboolean android_content_AssetManager_applyStyle(JNIEnv* env, jobject cla dest[STYLE_RESOURCE_ID] = resid; dest[STYLE_CHANGING_CONFIGURATIONS] = typeSetFlags; dest[STYLE_DENSITY] = config.density; - + if (indices != NULL && value.dataType != Res_value::TYPE_NULL) { indicesIdx++; indices[indicesIdx] = ii; } - + dest += STYLE_NUM_ENTRIES; } @@ -1212,7 +1212,7 @@ static jboolean android_content_AssetManager_retrieveAttributes(JNIEnv* env, job jniThrowException(env, "java/lang/NullPointerException", "out values"); return JNI_FALSE; } - + AssetManager* am = assetManagerForJavaObject(env, clazz); if (am == NULL) { return JNI_FALSE; @@ -1221,20 +1221,20 @@ static jboolean android_content_AssetManager_retrieveAttributes(JNIEnv* env, job ResXMLParser* xmlParser = (ResXMLParser*)xmlParserToken; ResTable_config config; Res_value value; - + const jsize NI = env->GetArrayLength(attrs); const jsize NV = env->GetArrayLength(outValues); if (NV < (NI*STYLE_NUM_ENTRIES)) { jniThrowException(env, "java/lang/IndexOutOfBoundsException", "out values too small"); return JNI_FALSE; } - + jint* src = (jint*)env->GetPrimitiveArrayCritical(attrs, 0); if (src == NULL) { jniThrowException(env, "java/lang/OutOfMemoryError", ""); return JNI_FALSE; } - + jint* baseDest = (jint*)env->GetPrimitiveArrayCritical(outValues, 0); jint* dest = baseDest; if (dest == NULL) { @@ -1242,7 +1242,7 @@ static jboolean android_content_AssetManager_retrieveAttributes(JNIEnv* env, job jniThrowException(env, "java/lang/OutOfMemoryError", ""); return JNI_FALSE; } - + jint* indices = NULL; int indicesIdx = 0; if (outIndices != NULL) { @@ -1253,27 +1253,27 @@ static jboolean android_content_AssetManager_retrieveAttributes(JNIEnv* env, job // Now lock down the resource object and start pulling stuff from it. res.lock(); - + // Retrieve the XML attributes, if requested. const jsize NX = xmlParser->getAttributeCount(); jsize ix=0; uint32_t curXmlAttr = xmlParser->getAttributeNameResID(ix); - + static const ssize_t kXmlBlock = 0x10000000; - + // Now iterate through all of the attributes that the client has requested, // filling in each with whatever data we can find. ssize_t block = 0; uint32_t typeSetFlags; for (jsize ii=0; ii curXmlAttr) { ix++; @@ -1286,7 +1286,7 @@ static jboolean android_content_AssetManager_retrieveAttributes(JNIEnv* env, job ix++; curXmlAttr = xmlParser->getAttributeNameResID(ix); } - + //printf("Attribute 0x%08x: type=0x%x, data=0x%08x\n", curIdent, value.dataType, value.data); uint32_t resid = 0; if (value.dataType != Res_value::TYPE_NULL) { @@ -1302,14 +1302,14 @@ static jboolean android_content_AssetManager_retrieveAttributes(JNIEnv* env, job #endif if (newBlock >= 0) block = newBlock; } - + // Deal with the special @null value -- it turns back to TYPE_NULL. if (value.dataType == Res_value::TYPE_REFERENCE && value.data == 0) { value.dataType = Res_value::TYPE_NULL; } - + //printf("Attribute 0x%08x: final type=0x%x, data=0x%08x\n", curIdent, value.dataType, value.data); - + // Write the final value back to Java. dest[STYLE_TYPE] = value.dataType; dest[STYLE_DATA] = value.data; @@ -1318,25 +1318,25 @@ static jboolean android_content_AssetManager_retrieveAttributes(JNIEnv* env, job dest[STYLE_RESOURCE_ID] = resid; dest[STYLE_CHANGING_CONFIGURATIONS] = typeSetFlags; dest[STYLE_DENSITY] = config.density; - + if (indices != NULL && value.dataType != Res_value::TYPE_NULL) { indicesIdx++; indices[indicesIdx] = ii; } - + dest += STYLE_NUM_ENTRIES; } - + res.unlock(); - + if (indices != NULL) { indices[0] = indicesIdx; env->ReleasePrimitiveArrayCritical(outIndices, indices, 0); } - + env->ReleasePrimitiveArrayCritical(outValues, baseDest, 0); env->ReleasePrimitiveArrayCritical(attrs, src, 0); - + return JNI_TRUE; } @@ -1348,12 +1348,12 @@ static jint android_content_AssetManager_getArraySize(JNIEnv* env, jobject clazz return NULL; } const ResTable& res(am->getResources()); - + res.lock(); const ResTable::bag_entry* defStyleEnt = NULL; ssize_t bagOff = res.getBagLocked(id, &defStyleEnt); res.unlock(); - + return bagOff; } @@ -1365,7 +1365,7 @@ static jint android_content_AssetManager_retrieveArray(JNIEnv* env, jobject claz jniThrowException(env, "java/lang/NullPointerException", "out values"); return JNI_FALSE; } - + AssetManager* am = assetManagerForJavaObject(env, clazz); if (am == NULL) { return JNI_FALSE; @@ -1374,25 +1374,25 @@ static jint android_content_AssetManager_retrieveArray(JNIEnv* env, jobject claz ResTable_config config; Res_value value; ssize_t block; - + const jsize NV = env->GetArrayLength(outValues); - + jint* baseDest = (jint*)env->GetPrimitiveArrayCritical(outValues, 0); jint* dest = baseDest; if (dest == NULL) { jniThrowException(env, "java/lang/OutOfMemoryError", ""); return JNI_FALSE; } - + // Now lock down the resource object and start pulling stuff from it. res.lock(); - + const ResTable::bag_entry* arrayEnt = NULL; uint32_t arrayTypeSetFlags = 0; ssize_t bagOff = res.getBagLocked(id, &arrayEnt, &arrayTypeSetFlags); const ResTable::bag_entry* endArrayEnt = arrayEnt + (bagOff >= 0 ? bagOff : 0); - + int i = 0; uint32_t typeSetFlags; while (i < NV && arrayEnt < endArrayEnt) { @@ -1400,7 +1400,7 @@ static jint android_content_AssetManager_retrieveArray(JNIEnv* env, jobject claz typeSetFlags = arrayTypeSetFlags; config.density = 0; value = arrayEnt->map.value; - + uint32_t resid = 0; if (value.dataType != Res_value::TYPE_NULL) { // Take care of resolving the found resource to its final value. @@ -1459,13 +1459,13 @@ static jint android_content_AssetManager_retrieveArray(JNIEnv* env, jobject claz i+= STYLE_NUM_ENTRIES; arrayEnt++; } - + i /= STYLE_NUM_ENTRIES; - + res.unlock(); - + env->ReleasePrimitiveArrayCritical(outValues, baseDest, 0); - + return i; } @@ -1538,7 +1538,7 @@ static jintArray android_content_AssetManager_getArrayStringInfo(JNIEnv* env, jo jint stringIndex = -1; jint stringBlock = 0; value = bag->map.value; - + // Take care of resolving the found resource to its final value. stringBlock = res.resolveReference(&value, bag->stringBlock, NULL); if (value.dataType == Res_value::TYPE_STRING) { @@ -1660,7 +1660,7 @@ static jintArray android_content_AssetManager_getArrayIntResource(JNIEnv* env, j const ResTable::bag_entry* bag = startOfBag; for (size_t i=0; ((ssize_t)i)map.value; - + // Take care of resolving the found resource to its final value. ssize_t block = res.resolveReference(&value, bag->stringBlock, NULL); #if THROW_ON_BAD_ID @@ -1729,15 +1729,15 @@ static jint android_content_AssetManager_splitThemePackage(JNIEnv* env, jobject const char* drmProtectedAssetFileName8 = env->GetStringUTFChars(javaString, NULL); ZipEntry *assetEntry = srcZip->getEntryByName(drmProtectedAssetFileName8); if (assetEntry == NULL) { - result = 1; + result = 1; LOGV("Invalid asset entry %s\n", drmProtectedAssetFileName8); } else { - status_t loc_result = dstZip->add(srcZip, assetEntry, 0, NULL); + status_t loc_result = dstZip->add(srcZip, assetEntry, 0, NULL); if (loc_result != NO_ERROR) { LOGV("error copying zip entry %s\n", drmProtectedAssetFileName8); result = result | 2; } else { - loc_result = srcZip->remove(assetEntry); + loc_result = srcZip->remove(assetEntry); if (loc_result != NO_ERROR) { LOGV("error removing zip entry %s\n", drmProtectedAssetFileName8); result = result | 4; diff --git a/include/utils/AssetManager.h b/include/utils/AssetManager.h index f374cae..88c75cf 100644 --- a/include/utils/AssetManager.h +++ b/include/utils/AssetManager.h @@ -81,8 +81,8 @@ public: virtual ~AssetManager(void); static int32_t getGlobalCount(); - - /* + + /* * Add a new source for assets. This can be called multiple times to * look in multiple places for assets. It can be either a directory (for * finding assets as raw files on the disk) or a ZIP file. This newly @@ -95,13 +95,13 @@ public: */ bool addAssetPath(const String8& path, void** cookie); - /* + /* * Convenience for adding the standard system assets. Uses the * ANDROID_ROOT environment variable to find them. */ bool addDefaultAssets(); - /* + /* * Iterate over the asset paths in this manager. (Previously * added via addAssetPath() and addDefaultAssets().) On first call, * 'cookie' must be NULL, resulting in the first cookie being returned. @@ -110,7 +110,7 @@ public: */ void* nextAssetPath(void* cookie) const; - /* + /* * Return an asset path in the manager. 'which' must be between 0 and * countAssetPaths(). */ @@ -194,7 +194,7 @@ public: */ FileType getFileType(const char* fileName); - /* + /* * Return the complete resource table to find things in the package. */ const ResTable& getResources(bool required = true) const; @@ -213,7 +213,7 @@ public: * the current data. */ bool isUpToDate(); - + /** * Get the known locales for this asset manager object. */ @@ -291,7 +291,7 @@ private: ResTable* setResourceTable(ResTable* res); bool isUpToDate(); - + protected: ~SharedZip(); @@ -338,7 +338,7 @@ private: static String8 getPathName(const char* path); bool isUpToDate(); - + private: void closeZip(int idx); diff --git a/include/utils/ResourceTypes.h b/include/utils/ResourceTypes.h index bae6b92..d762a13 100644 --- a/include/utils/ResourceTypes.h +++ b/include/utils/ResourceTypes.h @@ -2015,7 +2015,7 @@ private: const ResTable_package* const pkg, const Header* const header); void print_value(const Package* pkg, const Res_value& value) const; - + mutable Mutex mLock; status_t mError; diff --git a/libs/utils/AssetManager.cpp b/libs/utils/AssetManager.cpp index b34c147..8380b67 100644 --- a/libs/utils/AssetManager.cpp +++ b/libs/utils/AssetManager.cpp @@ -127,7 +127,7 @@ bool AssetManager::addAssetPath(const String8& path, void** cookie) return true; } } - + LOGV("In %p Asset %s path: %s", this, ap.type == kFileTypeDirectory ? "dir" : "zip", ap.path.string()); @@ -190,7 +190,7 @@ void AssetManager::setLocaleLocked(const char* locale) delete[] mLocale; } mLocale = strdupNew(locale); - + updateResourceParamsLocked(); } @@ -685,7 +685,7 @@ Asset* AssetManager::openInLocaleVendorLocked(const char* fileName, AccessMode m /* look at the filesystem on disk */ String8 path(createPathNameLocked(ap, locale, vendor)); path.appendPath(fileName); - + String8 excludeName(path); excludeName.append(kExcludeExtension); if (::getFileType(excludeName.string()) != kFileTypeNonexistent) { @@ -693,28 +693,28 @@ Asset* AssetManager::openInLocaleVendorLocked(const char* fileName, AccessMode m //printf("+++ excluding '%s'\n", (const char*) excludeName); return kExcludedAsset; } - + pAsset = openAssetFromFileLocked(path, mode); - + if (pAsset == NULL) { /* try again, this time with ".gz" */ path.append(".gz"); pAsset = openAssetFromFileLocked(path, mode); } - + if (pAsset != NULL) pAsset->setAssetSource(path); } else { /* find in cache */ String8 path(createPathNameLocked(ap, locale, vendor)); path.appendPath(fileName); - + AssetDir::FileInfo tmpInfo; bool found = false; - + String8 excludeName(path); excludeName.append(kExcludeExtension); - + if (mCache.indexOf(excludeName) != NAME_NOT_FOUND) { /* go no farther */ //printf("+++ Excluding '%s'\n", (const char*) excludeName); @@ -1533,7 +1533,7 @@ bool AssetManager::fncScanAndMergeDirLocked( // XXX This is broken -- the filename cache needs to hold the base // asset path separately from its filename. - + partialPath = createPathNameLocked(ap, locale, vendor); if (dirName[0] != '\0') { partialPath.appendPath(dirName); diff --git a/media/java/android/media/Ringtone.java b/media/java/android/media/Ringtone.java index 02a770f..4fe647c 100644 --- a/media/java/android/media/Ringtone.java +++ b/media/java/android/media/Ringtone.java @@ -53,7 +53,7 @@ public class Ringtone { DrmStore.Audio.DATA, DrmStore.Audio.TITLE }; - + private MediaPlayer mAudio; private Uri mUri; @@ -111,7 +111,7 @@ public class Ringtone { if (mTitle != null) return mTitle; return mTitle = getTitle(context, mUri, true); } - + private static String stringForQuery(Cursor cursor) { if (cursor != null) { try { diff --git a/media/java/android/media/RingtoneManager.java b/media/java/android/media/RingtoneManager.java index 1998733..c27dfff 100644 --- a/media/java/android/media/RingtoneManager.java +++ b/media/java/android/media/RingtoneManager.java @@ -198,7 +198,7 @@ public class RingtoneManager { "\"" + MediaStore.Audio.Media.EXTERNAL_CONTENT_URI + "/\" || " + MediaStore.Audio.Media._ID, MediaStore.Audio.Media.TITLE_KEY }; - + /** * The column index (in the cursor returned by {@link #getCursor()} for the * row ID. @@ -408,11 +408,11 @@ public class RingtoneManager { return getUriFromCursor(cursor); } - + private static Uri getUriFromCursor(Cursor cursor) { return Uri.parse(cursor.getString(URI_COLUMN_INDEX)); } - + /** * Gets the position of a {@link Uri} within this {@link RingtoneManager}. * diff --git a/services/java/com/android/server/PackageManagerService.java b/services/java/com/android/server/PackageManagerService.java index 79f96bd..3cef105 100644 --- a/services/java/com/android/server/PackageManagerService.java +++ b/services/java/com/android/server/PackageManagerService.java @@ -349,7 +349,7 @@ class PackageManagerService extends IPackageManager.Stub { final ResolveInfo mResolveInfo = new ResolveInfo(); ComponentName mResolveComponentName; PackageParser.Package mPlatformPackage; - + IAssetRedirectionManager mAssetRedirectionManager; // Set of pending broadcasts for aggregating enable/disable of components. @@ -2369,7 +2369,7 @@ class PackageManagerService extends IPackageManager.Stub { } return finalList; } - + public List getInstalledThemePackages() { // Returns a list of theme APKs. ArrayList finalList = new ArrayList(); -- cgit v1.1