resolved conflicts for merge of a8bce7c8 to master

Change-Id: I34526a3aed6591639e1a1bff8f42e0c5d8e328cc
2010-09-27 20:25:20 -07:00
parent 9b8a51e9d3 a8bce7c8ac
commit 64bbbb471e
1 changed files with 3 additions and 4 deletions
--- 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);
+		}
    }

    /**