summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Lais Andrade <lsandrade@google.com> 2020-07-31 15:39:58 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-07-31 15:39:58 +0000
commit49a6652b9c8e800c617fa7e2250f7ea01425fabf (patch)
treed0021236dad9d1d46eb5d0d25447f7308de72120
parentd7a14de01b31dfefa6595325e21b8ee96c0fb90b (diff)
parent5e4cbeea2996d700b5f967d11f535d7557314a15 (diff)
Merge "Update language to comply with Android's inclusive language guidance" am: cb51202601 am: 6c6e238f23 am: 40bdc0c86f am: d2ce0e0f17 am: 5e4cbeea29
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382537 Change-Id: I97bd8e5c53babf73fb48aba24d4057ed0281efea
-rw-r--r--core/java/android/content/ContentProvider.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/core/java/android/content/ContentProvider.java b/core/java/android/content/ContentProvider.java
index 60ecf64dd0a9..33be50d34777 100644
--- a/core/java/android/content/ContentProvider.java
+++ b/core/java/android/content/ContentProvider.java
@@ -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();