resolved conflicts for merge of a8bce7c8 to master (64bbbb47) · Commits · e / os / android_frameworks_base

core/java/android/content/ContentResolver.java

+3 −4

Original line number	Diff line number	Diff line
		@@ -241,12 +241,11 @@ 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);
		}