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

am 3789b2fb: am ace72f6a: Merge "Function uri.getAuthority is called twice. Minor doc corrections."

Browse Source 
# By Yury Zhauniarovich
# Via Gerrit Code Review (2) and Android Git Automerger (1)
* commit '3789b2fb823b7632e410c0191ddf77dc1e875196':
  Function uri.getAuthority is called twice. Minor doc corrections.
This commit is contained in:
Kenny Root
2013-02-04 17:19:31 -08:00
committed by Android Git Automerger
parent 77a0ce1233 3789b2fb82
commit 35e832730c
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

@@ -549,7 +549,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)
*/
@@ -1080,9 +1080,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;
}
@@ -1099,9 +1099,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;
}