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

Commit 4d8d93b5 authored by Sergey Nikolaienkov's avatar Sergey Nikolaienkov Committed by Android (Google) Code Review
Browse files

Merge "Make ANR dialog settings visible to tests"

parents d7e70d27 79331e77

api/test-current.txt

+3 −0
Original line number Diff line number Diff line
@@ -3292,6 +3292,7 @@ package android.provider { 
    field public static final String LOW_POWER_MODE_STICKY = "low_power_sticky";

    field public static final String NOTIFICATION_BUBBLES = "notification_bubbles";

    field public static final String OVERLAY_DISPLAY_DEVICES = "overlay_display_devices";

    field public static final String SHOW_FIRST_CRASH_DIALOG = "show_first_crash_dialog";

    field public static final String TETHER_OFFLOAD_DISABLED = "tether_offload_disabled";

    field public static final String USE_OPEN_WIFI_PACKAGE = "use_open_wifi_package";

  }
@@ -3300,6 +3301,7 @@ package android.provider { 
    method @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public static void resetToDefaults(@NonNull android.content.ContentResolver, @Nullable String);

    field public static final String ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED = "accessibility_display_magnification_enabled";

    field public static final String ACCESSIBILITY_SHORTCUT_TARGET_SERVICE = "accessibility_shortcut_target_service";

    field public static final String ANR_SHOW_BACKGROUND = "anr_show_background";

    field public static final String AUTOFILL_FEATURE_FIELD_CLASSIFICATION = "autofill_field_classification";

    field public static final String AUTOFILL_SERVICE = "autofill_service";

    field public static final String AUTOFILL_USER_DATA_MAX_CATEGORY_COUNT = "autofill_user_data_max_category_count";
@@ -3320,6 +3322,7 @@ package android.provider { 
    field public static final String NFC_PAYMENT_DEFAULT_COMPONENT = "nfc_payment_default_component";

    field public static final String NOTIFICATION_BADGING = "notification_badging";

    field public static final String POWER_MENU_LOCKED_SHOW_CONTENT = "power_menu_locked_show_content";

    field public static final String SHOW_FIRST_CRASH_DIALOG_DEV_OPTION = "show_first_crash_dialog_dev_option";

    field public static final String SHOW_IME_WITH_HARD_KEYBOARD = "show_ime_with_hard_keyboard";

    field @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public static final String SYNC_PARENT_SOUNDS = "sync_parent_sounds";

    field public static final String USER_SETUP_COMPLETE = "user_setup_complete";

core/java/android/provider/Settings.java

+6 −0
Original line number Diff line number Diff line
@@ -7614,6 +7614,8 @@ public final class Settings { 
         * @hide

         */

        @UnsupportedAppUsage

        @TestApi

        @SuppressLint("NoSettingsProvider")

        public static final String ANR_SHOW_BACKGROUND = "anr_show_background";















        /**









@@ -7621,6 +7623,8 @@ public final class Settings {













         * Otherwise, the process will be silently killed.















         * @hide















         */













        @TestApi













        @SuppressLint("NoSettingsProvider")















        public static final String SHOW_FIRST_CRASH_DIALOG_DEV_OPTION =















                "show_first_crash_dialog_dev_option";
























@@ -14180,6 +14184,8 @@ public final class Settings {













         * Otherwise, the process will be silently killed.















         * @hide















         */













        @TestApi













        @SuppressLint("NoSettingsProvider")















        public static final String SHOW_FIRST_CRASH_DIALOG = "show_first_crash_dialog";





























        /**