Merge "Function uri.getAuthority is called twice. Minor doc corrections." (ace72f6a) · Commits · e / os / android_frameworks_base

core/java/android/content/ContentResolver.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -518,7 +518,7 @@ public abstract class ContentResolver {
		* ContentProvider.openFile}.
		* @return Returns a new ParcelFileDescriptor pointing to the file. You
		* own this descriptor and are responsible for closing it when done.
		* @throws FileNotFoundException Throws FileNotFoundException of no
		* @throws FileNotFoundException Throws FileNotFoundException if no
		* file exists under the URI or the mode is invalid.
		* @see #openAssetFileDescriptor(Uri, String)
		*/
		@@ -1049,9 +1049,9 @@ public abstract class ContentResolver {
		if (!SCHEME_CONTENT.equals(uri.getScheme())) {
		return null;
		}
		String auth = uri.getAuthority();
		final String auth = uri.getAuthority();
		if (auth != null) {
		return acquireProvider(mContext, uri.getAuthority());
		return acquireProvider(mContext, auth);
		}
		return null;
		}
		@@ -1068,9 +1068,9 @@ public abstract class ContentResolver {
		if (!SCHEME_CONTENT.equals(uri.getScheme())) {
		return null;
		}
		String auth = uri.getAuthority();
		final String auth = uri.getAuthority();
		if (auth != null) {
		return acquireExistingProvider(mContext, uri.getAuthority());
		return acquireExistingProvider(mContext, auth);
		}
		return null;
		}