Merge "Add StringDef annotation for SYSTEM_SETTINGS_WHITELIST"

import android.annotation.RequiresPermission;

import android.annotation.SdkConstant;

import android.annotation.SdkConstant.SdkConstantType;

import android.annotation.StringDef;

import android.annotation.SuppressLint;

import android.annotation.SystemApi;

import android.annotation.SystemService;

import android.os.UserHandle;

import android.os.UserManager;

import android.provider.ContactsContract.Directory;

import android.provider.Settings;

import android.security.AttestedKeyPair;

import android.security.Credentials;

import android.security.KeyChain;

        }

    }

    /** @hide */

    @StringDef({

            Settings.System.SCREEN_BRIGHTNESS_MODE,

            Settings.System.SCREEN_BRIGHTNESS,

            Settings.System.SCREEN_OFF_TIMEOUT

    })

    @Retention(RetentionPolicy.SOURCE)

    public @interface SystemSettingsWhitelist {}

    /**

     * Called by device owner to update {@link android.provider.Settings.System} settings.

     * Validation that the value of the setting is in the correct form for the setting type should

     * @param value The value to update the setting to.

     * @throws SecurityException if {@code admin} is not a device owner.

     */

    public void setSystemSetting(@NonNull ComponentName admin, @NonNull String setting,

            String value) {

    public void setSystemSetting(@NonNull ComponentName admin,

            @NonNull @SystemSettingsWhitelist String setting, String value) {

        throwIfParentInstance("setSystemSetting");

        if (mService != null) {

            try {