Merge "Update language to comply with Android's inclusive language guidance" into main (ff3d778f) · Commits · e / os / android_frameworks_base

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

+6 −6

Original line number	Diff line number	Diff line
		@@ -31,17 +31,17 @@ import java.io.IOException;
		import libcore.io.IoUtils;

		/**
		* <p>CertBlacklister provides a simple mechanism for updating the platform blacklists for SSL
		* <p>CertBlacklister provides a simple mechanism for updating the platform denylists for SSL
		* certificate public keys and serial numbers.
		*/
		public class CertBlacklister extends Binder {

		private static final String TAG = "CertBlacklister";

		private static final String BLACKLIST_ROOT = System.getenv("ANDROID_DATA") + "/misc/keychain/";
		private static final String DENYLIST_ROOT = System.getenv("ANDROID_DATA") + "/misc/keychain/";

		public static final String PUBKEY_PATH = BLACKLIST_ROOT + "pubkey_blacklist.txt";
		public static final String SERIAL_PATH = BLACKLIST_ROOT + "serial_blacklist.txt";
		public static final String PUBKEY_PATH = DENYLIST_ROOT + "pubkey_blacklist.txt";
		public static final String SERIAL_PATH = DENYLIST_ROOT + "serial_blacklist.txt";

		public static final String PUBKEY_BLACKLIST_KEY = "pubkey_blacklist";
		public static final String SERIAL_BLACKLIST_KEY = "serial_blacklist";
		@@ -66,14 +66,14 @@ public class CertBlacklister extends Binder {
		@Override
		public void onChange(boolean selfChange) {
		super.onChange(selfChange);
		writeBlacklist();
		writeDenylist();
		}

		public String getValue() {
		return Settings.Secure.getString(mContentResolver, mKey);
		}

		private void writeBlacklist() {
		private void writeDenylist() {
		new Thread("BlacklistUpdater") {
		public void run() {
		synchronized(mTmpDir) {

+1 −1

Original line number	Diff line number	Diff line
		@@ -1941,7 +1941,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
		if (btSCoOn) {
		// Use the SCO device known to BtHelper so that it matches exactly
		// what has been communicated to audio policy manager. The device
		// returned by requestedCommunicationDevice() can be a dummy SCO device if legacy
		// returned by requestedCommunicationDevice() can be a placeholder SCO device if legacy
		// APIs are used to start SCO audio.
		AudioDeviceAttributes device = mBtHelper.getHeadsetAudioDevice();
		if (device != null) {

+2 −2

Original line number	Diff line number	Diff line
		@@ -714,7 +714,7 @@ public class SyncManager {
		// This can be noisy, therefore we will allowlist sync adapters installed
		// before we started checking for account access because they already know
		// the account (they run before) which is the genie is out of the bottle.
		whiteListExistingSyncAdaptersIfNeeded();
		allowListExistingSyncAdaptersIfNeeded();

		mLogger.log("Sync manager initialized: " + Build.FINGERPRINT);
		}
		@@ -755,7 +755,7 @@ public class SyncManager {
		}
		}

		private void whiteListExistingSyncAdaptersIfNeeded() {
		private void allowListExistingSyncAdaptersIfNeeded() {
		if (!mSyncStorageEngine.shouldGrantSyncAdaptersAccountAccess()) {
		return;
		}

+5 −5

Original line number	Diff line number	Diff line
		@@ -52,11 +52,11 @@ public class SyncManagerConstants extends ContentObserver {
		private static final int DEF_MAX_RETRIES_WITH_APP_STANDBY_EXEMPTION = 5;
		private int mMaxRetriesWithAppStandbyExemption = DEF_MAX_RETRIES_WITH_APP_STANDBY_EXEMPTION;

		private static final String KEY_EXEMPTION_TEMP_WHITELIST_DURATION_IN_SECONDS =
		private static final String KEY_EXEMPTION_TEMP_ALLOWLIST_DURATION_IN_SECONDS =
		"exemption_temp_whitelist_duration_in_seconds";
		private static final int DEF_EXEMPTION_TEMP_WHITELIST_DURATION_IN_SECONDS = 10 * 60;
		private static final int DEF_EXEMPTION_TEMP_ALLOWLIST_DURATION_IN_SECONDS = 10 * 60;
		private int mKeyExemptionTempWhitelistDurationInSeconds
		= DEF_EXEMPTION_TEMP_WHITELIST_DURATION_IN_SECONDS;
		= DEF_EXEMPTION_TEMP_ALLOWLIST_DURATION_IN_SECONDS;

		protected SyncManagerConstants(Context context) {
		super(null);
		@@ -105,8 +105,8 @@ public class SyncManagerConstants extends ContentObserver {
		DEF_MAX_RETRIES_WITH_APP_STANDBY_EXEMPTION);

		mKeyExemptionTempWhitelistDurationInSeconds = parser.getInt(
		KEY_EXEMPTION_TEMP_WHITELIST_DURATION_IN_SECONDS,
		DEF_EXEMPTION_TEMP_WHITELIST_DURATION_IN_SECONDS);
		KEY_EXEMPTION_TEMP_ALLOWLIST_DURATION_IN_SECONDS,
		DEF_EXEMPTION_TEMP_ALLOWLIST_DURATION_IN_SECONDS);

		}
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -725,7 +725,7 @@ public class AppIntegrityManagerServiceImpl extends IAppIntegrityManager.Stub {
		}

		private String getCallingRulePusherPackageName(int callingUid) {
		// Obtain the system apps that are whitelisted in config_integrityRuleProviderPackages.
		// Obtain the system apps that are allowlisted in config_integrityRuleProviderPackages.
		List<String> allowedRuleProviders = getAllowedRuleProviderSystemApps();
		if (DEBUG_INTEGRITY_COMPONENT) {
		Slog.i(