Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bf30fbe0 authored by Kenny Root's avatar Kenny Root Committed by Android Git Automerger
Browse files

am 35e83273: am 3789b2fb: am ace72f6a: Merge "Function uri.getAuthority is... 

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

# By Yury Zhauniarovich
# Via Android Git Automerger (2) and Gerrit Code Review (2)
* commit '35e83273':
  Function uri.getAuthority is called twice. Minor doc corrections.
parents f40ca9d7 35e83273

core/java/android/content/ContentResolver.java

+5 −5
Original line number Original line Diff line number Diff line
@@ -549,7 +549,7 @@ public abstract class ContentResolver { 
     * ContentProvider.openFile}.

     * ContentProvider.openFile}.

     * @return Returns a new ParcelFileDescriptor pointing to the file.  You

     * @return Returns a new ParcelFileDescriptor pointing to the file.  You

     * own this descriptor and are responsible for closing it when done.

     * 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.

     * file exists under the URI or the mode is invalid.

     * @see #openAssetFileDescriptor(Uri, String)

     * @see #openAssetFileDescriptor(Uri, String)

     */

     */
@@ -1080,9 +1080,9 @@ public abstract class ContentResolver { 
        if (!SCHEME_CONTENT.equals(uri.getScheme())) {

        if (!SCHEME_CONTENT.equals(uri.getScheme())) {

            return null;

            return null;

        }

        }

        String auth = uri.getAuthority();

        final String auth = uri.getAuthority();

        if (auth != null) {

        if (auth != null) {

            return acquireProvider(mContext, uri.getAuthority());

            return acquireProvider(mContext, auth);

        }

        }

        return null;

        return null;

    }

    }
@@ -1099,9 +1099,9 @@ public abstract class ContentResolver { 
        if (!SCHEME_CONTENT.equals(uri.getScheme())) {

        if (!SCHEME_CONTENT.equals(uri.getScheme())) {

            return null;

            return null;

        }

        }

        String auth = uri.getAuthority();

        final String auth = uri.getAuthority();

        if (auth != null) {

        if (auth != null) {

            return acquireExistingProvider(mContext, uri.getAuthority());

            return acquireExistingProvider(mContext, auth);

        }

        }

        return null;

        return null;

    }

    }