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

Commit 38be1561 authored by Chan Kim's avatar Chan Kim Committed by Automerger Merge Worker
Browse files

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

Merge "Update language to comply with Android's inclusive language guidance" into main am: 6f075fb8 am: 511bf6bb

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2717543



Change-Id: Ic116df970e6b5265d4c35d05bdc552988c0fdd5d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 02411d54 511bf6bb

packages/SettingsProvider/src/android/provider/settings/backup/GlobalSettings.java

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ public class GlobalSettings { 
    /**

     * These keys may be mentioned in the SETTINGS_TO_BACKUP arrays in SystemSettings

     * and SecureSettings as well.  This is because those tables drive both backup and

     * restore, and restore needs to properly whitelist keys that used to live

     * restore, and restore needs to properly allowlist keys that used to live

     * in those namespaces.

     *

     * NOTE: Settings are backed up and restored in the order they appear

packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java

+2 −2
Original line number Diff line number Diff line
@@ -884,7 +884,7 @@ public class SettingsBackupAgent extends BackupAgentHelper { 
    @VisibleForTesting

    SettingsBackupWhitelist getBackupWhitelist(Uri contentUri) {

        // Figure out the white list and redirects to the global table.  We restore anything

        // in either the backup whitelist or the legacy-restore whitelist for this table.

        // in either the backup allowlist or the legacy-restore allowlist for this table.

        String[] whitelist;

        Map<String, Validator> validators = null;

        if (contentUri.equals(Settings.Secure.CONTENT_URI)) {
@@ -1432,7 +1432,7 @@ public class SettingsBackupAgent extends BackupAgentHelper { 
    }



    /**

     * Store the whitelist of settings to be backed up and validators for them.

     * Store the allowlist of settings to be backed up and validators for them.

     */

    @VisibleForTesting

    static class SettingsBackupWhitelist {

packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java

+3 −3
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ public class SettingsProvider extends ContentProvider { 
    public static final int WRITE_FALLBACK_SETTINGS_FILES_JOB_ID = 1;

    public static final long ONE_DAY_INTERVAL_MILLIS = 24 * 60 * 60 * 1000L;



    // Overlay specified settings whitelisted for Instant Apps

    // Overlay specified settings allowlisted for Instant Apps

    private static final Set<String> OVERLAY_ALLOWED_GLOBAL_INSTANT_APP_SETTINGS = new ArraySet<>();

    private static final Set<String> OVERLAY_ALLOWED_SYSTEM_INSTANT_APP_SETTINGS = new ArraySet<>();

    private static final Set<String> OVERLAY_ALLOWED_SECURE_INSTANT_APP_SETTINGS = new ArraySet<>();
@@ -2131,7 +2131,7 @@ public class SettingsProvider extends ContentProvider { 


    @GuardedBy("mLock")

    private List<String> getSettingsNamesLocked(int settingsType, int userId) {

        // Don't enforce the instant app whitelist for now -- its too prone to unintended breakage

        // Don't enforce the instant app allowlist for now -- its too prone to unintended breakage

        // in the current form.

        return mSettingsRegistry.getSettingsNamesLocked(settingsType, userId);

    }
@@ -2172,7 +2172,7 @@ public class SettingsProvider extends ContentProvider { 
        }

        if (!getInstantAppAccessibleSettings(settingsType).contains(settingName)

                && !getOverlayInstantAppAccessibleSettings(settingsType).contains(settingName)) {

            // Don't enforce the instant app whitelist for now -- its too prone to unintended

            // Don't enforce the instant app allowlist for now -- its too prone to unintended

            // breakage in the current form.

            Slog.w(LOG_TAG, "Instant App " + ai.packageName

                    + " trying to access unexposed setting, this will be an error in the future.");