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

Commit 05e513d1 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: I8aa4186f44957fc69aebceeeff1e6584b4eebd5a
parent 4172f8a6

services/accessibility/java/com/android/server/accessibility/gestures/GestureManifold.java

+1 −1
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ class GestureManifold implements GestureMatcher.StateChangeListener { 
    boolean onMotionEvent(MotionEvent event, MotionEvent rawEvent, int policyFlags) {

        if (mState.isClear()) {

            if (event.getActionMasked() == MotionEvent.ACTION_DOWN) {

                // Sanity safeguard: if touch state is clear, then matchers should always be clear

                // Validity safeguard: if touch state is clear, then matchers should always be clear

                // before processing the next down event.

                clear();

            } else {

services/contentcapture/java/com/android/server/contentcapture/ContentCapturePerUserService.java

+1 −1
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ final class ContentCapturePerUserService 
    void onConnected() {

        synchronized (mLock) {

            if (mZombie) {

                // Sanity check - shouldn't happen

                // Validity check - shouldn't happen

                if (mRemoteService == null) {

                    Slog.w(TAG, "Cannot ressurect sessions because remote service is null");

                    return;

services/core/java/com/android/server/NetworkManagementService.java

+2 −2
Original line number Diff line number Diff line
@@ -373,7 +373,7 @@ public class NetworkManagementService extends INetworkManagementService.Stub { 
     */

    private void notifyInterfaceRemoved(String iface) {

        // netd already clears out quota and alerts for removed ifaces; update

        // our sanity-checking state.

        // our validity-checking state.

        mActiveAlerts.remove(iface);

        mActiveQuotas.remove(iface);

        invokeForAllObservers(o -> o.interfaceRemoved(iface));
@@ -1256,7 +1256,7 @@ public class NetworkManagementService extends INetworkManagementService.Stub { 
    public void setInterfaceAlert(String iface, long alertBytes) {

        NetworkStack.checkNetworkStackPermission(mContext);



        // quick sanity check

        // quick validity check

        if (!mActiveQuotas.containsKey(iface)) {

            throw new IllegalStateException("setting alert requires existing quota on iface");

        }

services/core/java/com/android/server/StorageManagerService.java

+2 −2
Original line number Diff line number Diff line
@@ -1112,7 +1112,7 @@ class StorageManagerService extends IStorageManager.Stub 
            }



            try {

                // TODO(b/135341433): Remove paranoid logging when FUSE is stable

                // TODO(b/135341433): Remove cautious logging when FUSE is stable

                Slog.i(TAG, "Resetting vold...");

                mVold.reset();

                Slog.i(TAG, "Reset vold");
@@ -2238,7 +2238,7 @@ class StorageManagerService extends IStorageManager.Stub 


    private void mount(VolumeInfo vol) {

        try {

            // TODO(b/135341433): Remove paranoid logging when FUSE is stable

            // TODO(b/135341433): Remove cautious logging when FUSE is stable

            Slog.i(TAG, "Mounting volume " + vol);

            mVold.mount(vol.id, vol.mountFlags, vol.mountUserId, new IVoldMountCallback.Stub() {

                @Override

services/core/java/com/android/server/accounts/AccountManagerService.java

+2 −2
Original line number Diff line number Diff line
@@ -2314,7 +2314,7 @@ public class AccountManagerService 
                List<String> accountRemovedReceivers =

                    getAccountRemovedReceivers(account, accounts);

                accounts.accountsDb.beginTransaction();

                // Set to a dummy value, this will only be used if the database

                // Set to a placeholder value, this will only be used if the database

                // transaction succeeds.

                long accountId = -1;

                try {
@@ -6266,7 +6266,7 @@ public class AccountManagerService 
                    PRE_N_DATABASE_NAME);

            if (userId == 0) {

                // Migrate old file, if it exists, to the new location.

                // Make sure the new file doesn't already exist. A dummy file could have been

                // Make sure the new file doesn't already exist. A placeholder file could have been

                // accidentally created in the old location,

                // causing the new one to become corrupted as well.

                File oldFile = new File(systemDir, PRE_N_DATABASE_NAME);