From 71cb19a6ce54e9694ce948a851d75cadd15bcc75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=ABl=20Stemmer?= Date: Wed, 29 Jul 2020 16:04:25 +0100 Subject: [PATCH] Update language to comply with Android's inclusive language guidance See https://source.android.com/setup/contribute/respectful-code for reference Bug: 161896447 Test: refactoring CL, existing tests still pass. Verified by running `atest UserBackupManagerServiceTest.java \ utils/BackupEligibilityRulesTest.java` Change-Id: Ibd97d99c64f6ddd82b3ba6e576f0a0ecd169d56f --- .../server/backup/utils/BackupEligibilityRules.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/services/backup/java/com/android/server/backup/utils/BackupEligibilityRules.java b/services/backup/java/com/android/server/backup/utils/BackupEligibilityRules.java index 162921528e95c..ee05c2b9ea3b5 100644 --- a/services/backup/java/com/android/server/backup/utils/BackupEligibilityRules.java +++ b/services/backup/java/com/android/server/backup/utils/BackupEligibilityRules.java @@ -37,7 +37,6 @@ import android.util.Slog; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.backup.IBackupTransport; import com.android.internal.util.ArrayUtils; -import com.android.server.LocalServices; import com.android.server.backup.transport.TransportClient; import com.google.android.collect.Sets; @@ -49,8 +48,8 @@ import java.util.Set; */ public class BackupEligibilityRules { private static final boolean DEBUG = false; - // Whitelist of system packages that are eligible for backup in non-system users. - private static final Set systemPackagesWhitelistedForAllUsers = + // List of system packages that are eligible for backup in non-system users. + private static final Set systemPackagesAllowedForAllUsers = Sets.newArraySet(PACKAGE_MANAGER_SENTINEL, PLATFORM_PACKAGE_NAME); private final PackageManager mPackageManager; @@ -97,9 +96,10 @@ public class BackupEligibilityRules { // 2. they run as a system-level uid if (UserHandle.isCore(app.uid)) { - // and the backup is happening for non-system user on a non-whitelisted package. + // and the backup is happening for a non-system user on a package that is not explicitly + // allowed. if (mUserId != UserHandle.USER_SYSTEM - && !systemPackagesWhitelistedForAllUsers.contains(app.packageName)) { + && !systemPackagesAllowedForAllUsers.contains(app.packageName)) { return false; }