diff options
| author | Steve Howard <showard@google.com> | 2010-08-18 13:38:44 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-18 13:38:44 -0700 |
| commit | 2f3c8c7eba7d1109cfb5a1886f094f6821376f11 (patch) | |
| tree | 603cea9f95e485a0045ed2219e87d4e47c99ef1e /src | |
| parent | 0f1c28532ce3a16aa61a271c9e44a9b7f72ba878 (diff) | |
| parent | 7bdfb134c6c1c4e3d4c5da61327e62bc38407c95 (diff) | |
| download | android_packages_providers_DownloadProvider-2f3c8c7eba7d1109cfb5a1886f094f6821376f11.tar.gz android_packages_providers_DownloadProvider-2f3c8c7eba7d1109cfb5a1886f094f6821376f11.tar.bz2 android_packages_providers_DownloadProvider-2f3c8c7eba7d1109cfb5a1886f094f6821376f11.zip | |
am 7bdfb134: Merge "Fix and test handling of null/empty download fields." into gingerbread
Merge commit '7bdfb134c6c1c4e3d4c5da61327e62bc38407c95' into gingerbread-plus-aosp
* commit '7bdfb134c6c1c4e3d4c5da61327e62bc38407c95':
Fix and test handling of null/empty download fields.
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/providers/downloads/DownloadProvider.java | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/com/android/providers/downloads/DownloadProvider.java b/src/com/android/providers/downloads/DownloadProvider.java index 4fcae227..f6b091b1 100644 --- a/src/com/android/providers/downloads/DownloadProvider.java +++ b/src/com/android/providers/downloads/DownloadProvider.java @@ -415,8 +415,8 @@ public final class DownloadProvider extends ContentProvider { if (Binder.getCallingUid() == 0) { copyInteger(Constants.UID, values, filteredValues); } - copyString(Downloads.Impl.COLUMN_TITLE, values, filteredValues); - copyString(Downloads.Impl.COLUMN_DESCRIPTION, values, filteredValues); + copyStringWithDefault(Downloads.Impl.COLUMN_TITLE, values, filteredValues, ""); + copyStringWithDefault(Downloads.Impl.COLUMN_DESCRIPTION, values, filteredValues, ""); filteredValues.put(Downloads.Impl.COLUMN_TOTAL_BYTES, -1); if (isPublicApi) { @@ -986,6 +986,14 @@ public final class DownloadProvider extends ContentProvider { } } + private static final void copyStringWithDefault(String key, ContentValues from, + ContentValues to, String defaultValue) { + copyString(key, from, to); + if (!to.containsKey(key)) { + to.put(key, defaultValue); + } + } + private class ReadOnlyCursorWrapper extends CursorWrapper implements CrossProcessCursor { public ReadOnlyCursorWrapper(Cursor cursor) { super(cursor); |