Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Function uri.getAuthority is called twice. Minor doc corrections."

Browse Source
This commit is contained in:
Kenny Root
2013-02-04 19:21:25 +00:00
committed by Gerrit Code Review
parent 43a601e769 f9c5176a51
commit ace72f6a37
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/content/ContentResolver.java
View File

@@ -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;
}