diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-09-27 20:25:20 -0700 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2010-09-27 20:25:20 -0700 |
| commit | 64bbbb471ed78ae06f411224849a4556a30fd362 (patch) | |
| tree | da8d166fa5bff875a3224b013c2f5e474cc15095 /core/java/android/content/ContentResolver.java | |
| parent | 9b8a51e9d34fe3ed7f980956be97463685949138 (diff) | |
| parent | a8bce7c8acb3904eb69bf21276c0ca2635c76a20 (diff) | |
| download | frameworks_base-64bbbb471ed78ae06f411224849a4556a30fd362.zip frameworks_base-64bbbb471ed78ae06f411224849a4556a30fd362.tar.gz frameworks_base-64bbbb471ed78ae06f411224849a4556a30fd362.tar.bz2 | |
resolved conflicts for merge of a8bce7c8 to master
Change-Id: I34526a3aed6591639e1a1bff8f42e0c5d8e328cc
Diffstat (limited to 'core/java/android/content/ContentResolver.java')
| -rw-r--r-- | core/java/android/content/ContentResolver.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/core/java/android/content/ContentResolver.java b/core/java/android/content/ContentResolver.java index 59e467a..3289120 100644 --- a/core/java/android/content/ContentResolver.java +++ b/core/java/android/content/ContentResolver.java @@ -241,15 +241,14 @@ public abstract class ContentResolver { if (provider == null) { return null; } + try { return provider.getStreamTypes(url, mimeTypeFilter); } catch (RemoteException e) { return null; - } catch (java.lang.Exception e) { - return null; } finally { - releaseProvider(provider); - } + releaseProvider(provider); + } } /** |