Merge "Update language to comply with Android's inclusive language guidance" am: 0b7e8cc6bc

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

Change-Id: I9d35fb93a825380ade57b9f2013fb95aa3fd1dc1
This commit is contained in:
Treehugger Robot
2020-07-30 00:40:06 +00:00
committed by Automerger Merge Worker

View File

@@ -594,7 +594,7 @@ public abstract class ContentResolver implements ContentInterface {
/**
* In addition to {@link #SYNC_EXEMPTION_PROMOTE_BUCKET}, we put the sync adapter app in the
* temp whitelist for 10 minutes, so that even RARE apps can run syncs right away.
* temp allowlist for 10 minutes, so that even RARE apps can run syncs right away.
* @hide
*/
public static final int SYNC_EXEMPTION_PROMOTE_BUCKET_WITH_TEMP = 2;