Merge "Update language to comply with Android's inclusive language guidance"

This commit is contained in:
TreeHugger Robot
2020-08-03 01:44:01 +00:00
committed by Android (Google) Code Review
9 changed files with 11 additions and 12 deletions

View File

@@ -112,13 +112,13 @@ public class ResetAppsHelper implements DialogInterface.OnClickListener,
public void run() {
final List<ApplicationInfo> apps = mPm.getInstalledApplications(
PackageManager.GET_DISABLED_COMPONENTS);
final List<String> whiteList = Arrays.asList(
final List<String> allowList = Arrays.asList(
mContext.getResources().getStringArray(
R.array.config_skip_reset_apps_package_name));
for (int i = 0; i < apps.size(); i++) {
ApplicationInfo app = apps.get(i);
if (whiteList.contains(app.packageName)) {
if (allowList.contains(app.packageName)) {
continue;
}
try {