From 2a9a33830d3878a059848f93ee2e6201a7be3e28 Mon Sep 17 00:00:00 2001 From: Songchun Fan Date: Wed, 3 Mar 2021 23:41:53 +0000 Subject: [settings] Remove @Readable for hidden fields added in S This protects newly added fields from being accessed outside system_server or system/privileged apps. BUG: 175024829 Test: atest android.appsecurity.cts.ReadableSettingsFieldsTest Change-Id: I40fda59c164a5982e811d51a69dc9aa8365b04d1 --- core/java/android/provider/Settings.java | 44 -------------------------------- 1 file changed, 44 deletions(-) diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 6865041a5037..c7d6194f3fda 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -4126,7 +4126,6 @@ public final class Settings { * unset or a match is not made, only the standard color modes will be restored. * @hide */ - @Readable public static final String DISPLAY_COLOR_MODE_VENDOR_HINT = "display_color_mode_vendor_hint"; @@ -6163,7 +6162,6 @@ public final class Settings { * * @hide */ - @Readable public static final String CAMERA_AUTOROTATE = "camera_autorotate"; /** @@ -6724,7 +6722,6 @@ public final class Settings { * android.app.timezonedetector.TimeZoneDetector#updateConfiguration} to update. * @hide */ - @Readable public static final String LOCATION_TIME_ZONE_DETECTION_ENABLED = "location_time_zone_detection_enabled"; @@ -7515,7 +7512,6 @@ public final class Settings { * * @hide */ - @Readable public static final String REDUCE_BRIGHT_COLORS_ACTIVATED = "reduce_bright_colors_activated"; @@ -7525,7 +7521,6 @@ public final class Settings { * * @hide */ - @Readable public static final String REDUCE_BRIGHT_COLORS_LEVEL = "reduce_bright_colors_level"; @@ -7534,7 +7529,6 @@ public final class Settings { * * @hide */ - @Readable public static final String REDUCE_BRIGHT_COLORS_PERSIST_ACROSS_REBOOTS = "reduce_bright_colors_persist_across_reboots"; @@ -8245,7 +8239,6 @@ public final class Settings { * @see #MATCH_CONTENT_FRAMERATE_ALWAYS * @hide */ - @Readable public static final String MATCH_CONTENT_FRAME_RATE = "match_content_frame_rate"; @@ -8373,7 +8366,6 @@ public final class Settings { * {@link Display.STATE_OFF} and {@link Display.STATE_DOZE}. * @hide */ - @Readable public static final String DOZE_QUICK_PICKUP_GESTURE = "doze_quick_pickup_gesture"; /** @@ -8479,7 +8471,6 @@ public final class Settings { * For user preference if swipe bottom to expand notification gesture enabled. * @hide */ - @Readable public static final String SWIPE_BOTTOM_TO_NOTIFICATION_ENABLED = "swipe_bottom_to_notification_enabled"; @@ -8487,28 +8478,24 @@ public final class Settings { * For user preference if One-Handed Mode enabled. * @hide */ - @Readable public static final String ONE_HANDED_MODE_ENABLED = "one_handed_mode_enabled"; /** * For user preference if One-Handed Mode timeout. * @hide */ - @Readable public static final String ONE_HANDED_MODE_TIMEOUT = "one_handed_mode_timeout"; /** * For user taps app to exit One-Handed Mode. * @hide */ - @Readable public static final String TAPS_APP_TO_EXIT = "taps_app_to_exit"; /** * Internal use, one handed mode tutorial showed times. * @hide */ - @Readable public static final String ONE_HANDED_TUTORIAL_SHOW_COUNT = "one_handed_tutorial_show_count"; @@ -8534,7 +8521,6 @@ public final class Settings { * The last computed night mode bool the last time the phone was on * @hide */ - @Readable public static final String UI_NIGHT_MODE_LAST_COMPUTED = "ui_night_mode_last_computed"; /** @@ -8953,7 +8939,6 @@ public final class Settings { * * @hide */ - @Readable public static final String EMERGENCY_GESTURE_ENABLED = "emergency_gesture_enabled"; /** @@ -8961,7 +8946,6 @@ public final class Settings { * * @hide */ - @Readable public static final String EMERGENCY_GESTURE_SOUND_ENABLED = "emergency_gesture_sound_enabled"; @@ -9694,7 +9678,6 @@ public final class Settings { * @see Settings.Secure#MEDIA_CONTROLS_RESUME * @hide */ - @Readable public static final String MEDIA_CONTROLS_RESUME_BLOCKED = "qs_media_resumption_blocked"; /** @@ -9742,7 +9725,6 @@ public final class Settings { * @hide */ @TestApi - @Readable public static final String ACCESSIBILITY_MAGNIFICATION_CAPABILITY = "accessibility_magnification_capability"; @@ -9752,7 +9734,6 @@ public final class Settings { * * @hide */ - @Readable public static final String ACCESSIBILITY_SHOW_WINDOW_MAGNIFICATION_PROMPT = "accessibility_show_window_magnification_prompt"; @@ -9769,7 +9750,6 @@ public final class Settings { * @see #ACCESSIBILITY_BUTTON_MODE_FLOATING_MENU * @hide */ - @Readable public static final String ACCESSIBILITY_BUTTON_MODE = "accessibility_button_mode"; @@ -9798,7 +9778,6 @@ public final class Settings { * * @hide */ - @Readable public static final String ACCESSIBILITY_FLOATING_MENU_SIZE = "accessibility_floating_menu_size"; @@ -9811,7 +9790,6 @@ public final class Settings { * * @hide */ - @Readable public static final String ACCESSIBILITY_FLOATING_MENU_ICON_TYPE = "accessibility_floating_menu_icon_type"; @@ -9820,7 +9798,6 @@ public final class Settings { * * @hide */ - @Readable public static final String ACCESSIBILITY_FLOATING_MENU_FADE_ENABLED = "accessibility_floating_menu_fade_enabled"; @@ -9830,7 +9807,6 @@ public final class Settings { * * @hide */ - @Readable public static final String ACCESSIBILITY_FLOATING_MENU_OPACITY = "accessibility_floating_menu_opacity"; @@ -9839,7 +9815,6 @@ public final class Settings { * * @hide */ - @Readable public static final String ADAPTIVE_CONNECTIVITY_ENABLED = "adaptive_connectivity_enabled"; /** @@ -9863,7 +9838,6 @@ public final class Settings { * * @hide */ - @Readable public static final String ASSIST_HANDLES_LEARNING_TIME_ELAPSED_MILLIS = "reminder_exp_learning_time_elapsed"; @@ -9872,7 +9846,6 @@ public final class Settings { * * @hide */ - @Readable public static final String ASSIST_HANDLES_LEARNING_EVENT_COUNT = "reminder_exp_learning_event_count"; @@ -10573,7 +10546,6 @@ public final class Settings { * * @hide */ - @Readable public static final String DEVELOPMENT_WM_DISPLAY_SETTINGS_PATH = "wm_display_settings_path"; @@ -10753,7 +10725,6 @@ public final class Settings { * * @hide */ - @Readable public static final String HDMI_CONTROL_SEND_STANDBY_ON_SLEEP = "hdmi_control_send_standby_on_sleep"; @@ -14431,7 +14402,6 @@ public final class Settings { * * @hide */ - @Readable public static final String EUICC_SWITCH_SLOT_TIMEOUT_MILLIS = "euicc_switch_slot_timeout_millis"; @@ -14441,7 +14411,6 @@ public final class Settings { * * @hide */ - @Readable public static final String ENABLE_MULTI_SLOT_TIMEOUT_MILLIS = "enable_multi_slot_timeout_millis"; @@ -14565,7 +14534,6 @@ public final class Settings { * * @hide */ - @Readable public static final String FORCE_NON_DEBUGGABLE_FINAL_BUILD_FOR_COMPAT = "force_non_debuggable_final_build_for_compat"; @@ -14645,7 +14613,6 @@ public final class Settings { * * @hide */ - @Readable public static final String ONE_HANDED_KEYGUARD_SIDE = "one_handed_keyguard_side"; /** @@ -15328,7 +15295,6 @@ public final class Settings { * The value 1 - enable, 0 - disable * @hide */ - @Readable public static final String NOTIFICATION_FEEDBACK_ENABLED = "notification_feedback_enabled"; /** @@ -15571,7 +15537,6 @@ public final class Settings { * * @hide */ - @Readable public static final String GNSS_SATELLITE_BLOCKLIST = "gnss_satellite_blocklist"; /** @@ -15776,7 +15741,6 @@ public final class Settings { * 1: Enabled * @hide */ - @Readable public static final String SHOW_PEOPLE_SPACE = "show_people_space"; /** @@ -15787,7 +15751,6 @@ public final class Settings { * 2: All conversations * @hide */ - @Readable public static final String PEOPLE_SPACE_CONVERSATION_TYPE = "people_space_conversation_type"; @@ -15798,7 +15761,6 @@ public final class Settings { * 1: Enabled * @hide */ - @Readable public static final String SHOW_NEW_NOTIF_DISMISS = "show_new_notif_dismiss"; /** @@ -15813,7 +15775,6 @@ public final class Settings { * 1: Enabled (All apps will receive the new rules) * @hide */ - @Readable public static final String BACKPORT_S_NOTIF_RULES = "backport_s_notif_rules"; /** @@ -15828,7 +15789,6 @@ public final class Settings { *

See {@link android.app.Notification.DevFlags} for more details. * @hide */ - @Readable public static final String FULLY_CUSTOM_VIEW_NOTIF_DECORATION = "fully_custom_view_notif_decoration"; @@ -15842,7 +15802,6 @@ public final class Settings { *

See {@link android.app.Notification.DevFlags} for more details. * @hide */ - @Readable public static final String DECORATED_CUSTOM_VIEW_NOTIF_DECORATION = "decorated_custom_view_notif_decoration"; @@ -15859,7 +15818,6 @@ public final class Settings { * * @hide */ - @Readable public static final String BLOCK_UNTRUSTED_TOUCHES_MODE = "block_untrusted_touches"; /** @@ -15885,7 +15843,6 @@ public final class Settings { * * @hide */ - @Readable public static final String MAXIMUM_OBSCURING_OPACITY_FOR_TOUCH = "maximum_obscuring_opacity_for_touch"; @@ -15898,7 +15855,6 @@ public final class Settings { * 1: enabled * @hide */ - @Readable public static final String RESTRICTED_NETWORKING_MODE = "restricted_networking_mode"; } -- cgit v1.2.3-59-g8ed1b