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

Commit ac9b4403 authored by Treehugger Robot's avatar Treehugger Robot 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: 0b7e8cc6 am: b5cf67da am: 66ea2045 am: c30e10ff

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

Change-Id: Ic8b8cd406972720b658b616f0989c731a282b5ca
parents f126aafa c30e10ff

core/java/android/content/ContentResolver.java

+1 −1
Original line number Diff line number Diff line
@@ -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

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