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

Commit 9b37625b authored Sep 11, 2020 by Jeff Sharkey

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: Ia37d0180a2d687fa788eea854f7d89ad5faab593

parent 05e513d1

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -93,7 +93,7 @@ final class ContentCapturePerUserService
		* Reference to the remote service.
		*
		* <p>It's set in the constructor, but it's also updated when the service's updated in the
		* master's cache (for example, because a temporary service was set).
		* main service's cache (for example, because a temporary service was set).
		*/
		@GuardedBy("mLock")
		@Nullable

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -2969,7 +2969,7 @@ class StorageManagerService extends IStorageManager.Stub
		return 0;
		}

		/** Set the password for encrypting the master key.
		/** Set the password for encrypting the main key.
		* @param type One of the CRYPTO_TYPE_XXX consts defined in StorageManager.
		* @param password The password to set.
		*/
		@@ -3033,7 +3033,7 @@ class StorageManagerService extends IStorageManager.Stub
		}

		/**
		* Get the type of encryption used to encrypt the master key.
		* Get the type of encryption used to encrypt the main key.
		* @return The type, one of the CRYPT_TYPE_XXX consts from StorageManager.
		*/
		@Override

services/core/java/com/android/server/audio/AudioService.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -3169,7 +3169,7 @@ public class AudioService extends IAudioService.Stub
		// For automotive,
		// - the car service is always running as system user
		// - foreground users are non-system users
		// Car service is in charge of dispatching the key event include master mute to Android.
		// Car service is in charge of dispatching the key event include global mute to Android.
		// Therefore, the getCurrentUser() is always different to the foreground user.
		if ((isPlatformAutomotive() && userId == UserHandle.USER_SYSTEM)
		\|\| (getCurrentUserId() == userId)) {
		@@ -3181,7 +3181,7 @@ public class AudioService extends IAudioService.Stub
		}
		}

		/** get master mute state. */
		/** get global mute state. */
		public boolean isMasterMute() {
		return AudioSystem.getMasterMute();
		}

services/core/java/com/android/server/content/SyncOperation.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -50,7 +50,7 @@ public class SyncOperation {
		public static final int REASON_IS_SYNCABLE = -5;
		/** Sync started because it has just been set to sync automatically. */
		public static final int REASON_SYNC_AUTO = -6;
		/** Sync started because master sync automatically has been set to true. */
		/** Sync started because global sync automatically has been set to true. */
		public static final int REASON_MASTER_SYNC_AUTO = -7;
		public static final int REASON_USER_START = -8;

services/core/java/com/android/server/infra/AbstractMasterSystemService.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -70,7 +70,7 @@ import java.util.Objects;
		* <p>See {@code com.android.server.autofill.AutofillManagerService} for a concrete
		* (no pun intended) example of how to use it.
		*
		* @param <M> "master" service class.
		* @param <M> "main" service class.
		* @param <S> "real" service class.
		*
		* @hide