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

Commit 6516a838 authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Update language to comply with Android's inclusive language guidance 

See https://source.android.com/setup/contribute/respectful-code for reference

Test: none
Bug: 168334533
Exempt-From-Owner-Approval: docs updates
Change-Id: Ifce5239991e3b78dd4757712e3b88093ad7161f0
parent 705f6bec

core/java/android/app/ActivityThread.java

+1 −1
Original line number Diff line number Diff line
@@ -4053,7 +4053,7 @@ public final class ActivityThread extends ClientTransactionHandler { 
    private void handleCreateBackupAgent(CreateBackupAgentData data) {

        if (DEBUG_BACKUP) Slog.v(TAG, "handleCreateBackupAgent: " + data);



        // Sanity check the requested target package's uid against ours

        // Validity check the requested target package's uid against ours

        try {

            PackageInfo requestedPackage = getPackageManager().getPackageInfo(

                    data.appInfo.packageName, 0, UserHandle.myUserId());

core/java/android/app/AppOps.md

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ To control access the app-op can be set to: 
: Allow the access but only if the app is currently in the [foreground](#foreground)



`MODE_IGNORED`

: Don't allow the access, i.e. don't perform the requested action or return dummy data

: Don't allow the access, i.e. don't perform the requested action or return placeholder data



`MODE_ERRORED`

: Throw a `SecurityException` on access. This can be suppressed by using a `...noThrow` method to

core/java/android/app/AppOpsManager.java

+3 −3
Original line number Diff line number Diff line
@@ -115,8 +115,8 @@ import java.util.function.Supplier; 
 *     <dt>{@link #MODE_ALLOWED}

 *     <dd>Allow the access

 *     <dt>{@link #MODE_IGNORED}

 *     <dd>Don't allow the access, i.e. don't perform the requested action or return no or dummy

 *     data

 *     <dd>Don't allow the access, i.e. don't perform the requested action or return no or

 *     placeholder data

 *     <dt>{@link #MODE_ERRORED}

 *     <dd>Throw a {@link SecurityException} on access. This can be suppressed by using a

 *     {@code ...noThrow} method to check the mode
@@ -135,7 +135,7 @@ import java.util.function.Supplier; 
 * <p>Each platform defined runtime permission (beside background modifiers) has an associated app

 * op which is used for tracking but also to allow for silent failures. I.e. if the runtime

 * permission is denied the caller gets a {@link SecurityException}, but if the permission is

 * granted and the app-op is {@link #MODE_IGNORED} then the callers gets dummy behavior, e.g.

 * granted and the app-op is {@link #MODE_IGNORED} then the callers gets placeholder behavior, e.g.

 * location callbacks would not happen.

 *

 * <h3>App-op permissions</h3>

core/java/android/app/SearchableInfo.java

+1 −1
Original line number Diff line number Diff line
@@ -418,7 +418,7 @@ public final class SearchableInfo implements Parcelable { 
                    com.android.internal.R.styleable.SearchableActionKey_suggestActionMsgColumn);

            a.recycle();



            // sanity check.

            // validity check.

            if (mKeyCode == 0) {

                throw new IllegalArgumentException("No keycode.");

            } else if ((mQueryActionMsg == null) &&

core/java/android/app/WallpaperColors.java

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ public final class WallpaperColors implements Parcelable { 
     */

    public static final int HINT_FROM_BITMAP = 1 << 2;



    // Maximum size that a bitmap can have to keep our calculations sane

    // Maximum size that a bitmap can have to keep our calculations valid

    private static final int MAX_BITMAP_SIZE = 112;



    // Even though we have a maximum size, we'll mainly match bitmap sizes