diff options
author | Kenny Root <kroot@android.com> | 2013-02-04 19:21:25 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-02-04 19:21:26 +0000 |
commit | ace72f6a37ffc232172346b3385494ef10195583 (patch) | |
tree | 6ab2c167e2d9ddac38783757bdd56b287dbbea78 | |
parent | 43a601e76966ae1d4af5b1117c10f0479a5f97cd (diff) | |
parent | f9c5176a51a49fea18712338429b4d125e550a4a (diff) | |
download | frameworks_base-ace72f6a37ffc232172346b3385494ef10195583.zip frameworks_base-ace72f6a37ffc232172346b3385494ef10195583.tar.gz frameworks_base-ace72f6a37ffc232172346b3385494ef10195583.tar.bz2 |
Merge "Function uri.getAuthority is called twice. Minor doc corrections."
-rw-r--r-- | core/java/android/content/ContentResolver.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/core/java/android/content/ContentResolver.java b/core/java/android/content/ContentResolver.java index 9e406d4..bde4d2b 100644 --- a/core/java/android/content/ContentResolver.java +++ b/core/java/android/content/ContentResolver.java @@ -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; } |