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

Commit 5e4cbeea authored by Lais Andrade's avatar Lais Andrade Committed by Automerger Merge Worker
Browse files

Merge "Update language to comply with Android's inclusive language guidance"... 

Merge "Update language to comply with Android's inclusive language guidance" am: cb512026 am: 6c6e238f am: 40bdc0c8 am: d2ce0e0f

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382537

Change-Id: I9887f9dbd581d5ff2577fa5ffc586abe97bac11e
parents 3a467f68 d2ce0e0f

core/java/android/content/ContentProvider.java

+2 −3
Original line number Diff line number Diff line
@@ -1620,13 +1620,12 @@ public abstract class ContentProvider implements ContentInterface, ComponentCall 
     * Implementation when a caller has performed an insert on the content

     * provider, but that call has been rejected for the operation given

     * to {@link #setAppOps(int, int)}.  The default implementation simply

     * returns a dummy URI that is the base URI with a 0 path element

     * appended.

     * returns a URI that is the base URI with a 0 path element appended.

     */

    public Uri rejectInsert(Uri uri, ContentValues values) {

        // If not allowed, we need to return some reasonable URI.  Maybe the

        // content provider should be responsible for this, but for now we

        // will just return the base URI with a dummy '0' tagged on to it.

        // will just return the base URI with a '0' tagged on to it.

        // You shouldn't be able to read if you can't write, anyway, so it

        // shouldn't matter much what is returned.

        return uri.buildUpon().appendPath("0").build();