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

Commit 4f020a8d authored Sep 02, 2020 by Jackal Guo

Update language to comply with Android's inclusive language guidance

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

Fix: 167521269
Test: m docs
Change-Id: Ia8b8e9248dc48ce40ba862aea48e24e43febbfac

parent 59de2409

core/java/android/content/pm/parsing/ApkLiteParseUtils.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -67,7 +67,7 @@ public class ApkLiteParseUtils {
		* Automatically detects if the package is a monolithic style (single APK
		* file) or cluster style (directory of APKs).
		* <p>
		* This performs sanity checking on cluster style packages, such as
		* This performs validity checking on cluster style packages, such as
		* requiring identical package name and version codes, a single base APK,
		* and unique split names.
		*

core/java/android/content/pm/parsing/ParsingPackageUtils.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -211,7 +211,7 @@ public class ParsingPackageUtils {
		* package is a monolithic style (single APK file) or cluster style
		* (directory of APKs).
		* <p>
		* This performs sanity checking on cluster style packages, such as
		* This performs validity checking on cluster style packages, such as
		* requiring identical package name and version codes, a single base APK,
		* and unique split names.
		* <p>
		@@ -237,7 +237,7 @@ public class ParsingPackageUtils {

		/**
		* Parse all APKs contained in the given directory, treating them as a
		* single package. This also performs sanity checking, such as requiring
		* single package. This also performs validity checking, such as requiring
		* identical package name and version codes, a single base APK, and unique
		* split names.
		* <p>

services/core/java/com/android/server/pm/PackageInstallerService.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -656,7 +656,7 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements
		throw new IllegalArgumentException("Invalid install mode: " + params.mode);
		}

		// If caller requested explicit location, sanity check it, otherwise
		// If caller requested explicit location, validity check it, otherwise
		// resolve the best internal or adopted location.
		if ((params.installFlags & PackageManager.INSTALL_INTERNAL) != 0) {
		if (!PackageHelper.fitsOnInternal(mContext, params)) {
		@@ -688,7 +688,7 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements
		final int sessionId;
		final PackageInstallerSession session;
		synchronized (mSessions) {
		// Sanity check that installer isn't going crazy
		// Check that the installer does not have too many active sessions.
		final int activeCount = getSessionCount(mSessions, callingUid);
		if (mContext.checkCallingOrSelfPermission(Manifest.permission.INSTALL_PACKAGES)
		== PackageManager.PERMISSION_GRANTED) {

services/core/java/com/android/server/pm/PackageInstallerSession.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -978,7 +978,7 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub {

		private ParcelFileDescriptor doWriteInternal(String name, long offsetBytes, long lengthBytes,
		ParcelFileDescriptor incomingFd) throws IOException {
		// Quick sanity check of state, and allocate a pipe for ourselves. We
		// Quick validity check of state, and allocate a pipe for ourselves. We
		// then do heavy disk allocation outside the lock, but this open pipe
		// will block any attempted install transitions.
		final RevocableFileDescriptor fd;
		@@ -3744,7 +3744,7 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub {
		out.endTag(null, TAG_SESSION);
		}

		// Sanity check to be performed when the session is restored from an external file. Only one
		// Validity check to be performed when the session is restored from an external file. Only one
		// of the session states should be true, or none of them.
		private static boolean isStagedSessionStateValid(boolean isReady, boolean isApplied,
		boolean isFailed) {

services/core/java/com/android/server/pm/PackageManagerShellCommandDataLoader.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -67,7 +67,6 @@ public class PackageManagerShellCommandDataLoader extends DataLoaderService {
		}
		}

		// Sanity check.
		if (sShellCommands.size() > TOO_MANY_PENDING_SHELL_COMMANDS) {
		Slog.e(TAG, "Too many pending shell commands: " + sShellCommands.size());
		}