Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I8dc6169505e7f24f90ad2fe47a7deeef9e9acef4
This commit is contained in:
Treehugger Robot
2020-07-30 01:06:43 +00:00
committed by Automerger Merge Worker
parent 99ef700f1e 66ea204537
commit c30e10ff21
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/content/ContentResolver.java
View File

@@ -726,7 +726,7 @@ public abstract class ContentResolver implements ContentInterface {
/** /**
* In addition to {@link #SYNC_EXEMPTION_PROMOTE_BUCKET}, we put the sync adapter app in the * 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 * @hide
*/ */
public static final int SYNC_EXEMPTION_PROMOTE_BUCKET_WITH_TEMP = 2; public static final int SYNC_EXEMPTION_PROMOTE_BUCKET_WITH_TEMP = 2;