diff options
| author | Terry Heo <terryheo@google.com> | 2014-11-13 15:56:22 -0800 |
|---|---|---|
| committer | Terry (Woncheol) Heo <terryheo@google.com> | 2014-11-14 00:01:55 +0000 |
| commit | 344b2d4293049df49881664a5c4c20dcb68ae7ec (patch) | |
| tree | 99d284a5f525ce729615f3fe422182b53638dffe | |
| parent | 6331ea953c11bbea7d7e027c8fa45fb4281cb1b0 (diff) | |
| download | TvProvider-lollipop-mr1-release.tar.gz | |
Throw FileNotFoundException when openLogoFile() failsandroid-wear-5.1.1_r1android-wear-5.1.0_r1android-m-preview-2android-m-preview-1android-m-previewandroid-cts-5.1_r9android-cts-5.1_r8android-cts-5.1_r7android-cts-5.1_r6android-cts-5.1_r5android-cts-5.1_r4android-cts-5.1_r3android-cts-5.1_r28android-cts-5.1_r27android-cts-5.1_r26android-cts-5.1_r25android-cts-5.1_r24android-cts-5.1_r23android-cts-5.1_r22android-cts-5.1_r21android-cts-5.1_r20android-cts-5.1_r2android-cts-5.1_r19android-cts-5.1_r18android-cts-5.1_r17android-cts-5.1_r16android-cts-5.1_r15android-cts-5.1_r14android-cts-5.1_r13android-cts-5.1_r10android-cts-5.1_r1android-5.1.1_r9android-5.1.1_r8android-5.1.1_r7android-5.1.1_r6android-5.1.1_r5android-5.1.1_r4android-5.1.1_r38android-5.1.1_r37android-5.1.1_r36android-5.1.1_r35android-5.1.1_r34android-5.1.1_r33android-5.1.1_r30android-5.1.1_r3android-5.1.1_r29android-5.1.1_r28android-5.1.1_r26android-5.1.1_r25android-5.1.1_r24android-5.1.1_r23android-5.1.1_r22android-5.1.1_r20android-5.1.1_r2android-5.1.1_r19android-5.1.1_r18android-5.1.1_r17android-5.1.1_r16android-5.1.1_r15android-5.1.1_r14android-5.1.1_r13android-5.1.1_r12android-5.1.1_r10android-5.1.1_r1android-5.1.0_r5android-5.1.0_r4android-5.1.0_r3android-5.1.0_r1master-soonglollipop-mr1-wfc-releaselollipop-mr1-releaselollipop-mr1-fi-releaselollipop-mr1-devlollipop-mr1-cts-release
ContentProvider should throw the exception instead of returning null object.
Bug: 18335090
Change-Id: Iffa0370b6c1c901ce665ca21aac6c94239fa476f
| -rw-r--r-- | src/com/android/providers/tv/TvProvider.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/providers/tv/TvProvider.java b/src/com/android/providers/tv/TvProvider.java index ea8dca7..cd70ad1 100644 --- a/src/com/android/providers/tv/TvProvider.java +++ b/src/com/android/providers/tv/TvProvider.java @@ -858,7 +858,11 @@ public class TvProvider extends ContentProvider { if (mode.equals("r")) { String sql = queryBuilder.buildQuery(new String[] { CHANNELS_COLUMN_LOGO }, params.getSelection(), null, null, null, null); - return DatabaseUtils.blobFileDescriptorForQuery(db, sql, params.getSelectionArgs()); + ParcelFileDescriptor fd = DatabaseUtils.blobFileDescriptorForQuery(db, sql, params.getSelectionArgs()); + if (fd == null) { + throw new FileNotFoundException(uri.toString()); + } + return fd; } else { try (Cursor cursor = queryBuilder.query(db, new String[] { Channels._ID }, params.getSelection(), params.getSelectionArgs(), null, null, null)) { |