Merge "Refactoring SystemSettingsProto to avoid method limit." into pi-dev

This commit is contained in:
TreeHugger Robot
2018-03-27 22:54:51 +00:00
committed by Android (Google) Code Review
3 changed files with 533 additions and 336 deletions

View File

@@ -20,9 +20,9 @@ package android.providers.settings;
option java_multiple_files = true;
option java_outer_classname = "SettingsServiceProto";
import "frameworks/base/core/proto/android/providers/settings/common.proto";
import "frameworks/base/core/proto/android/providers/settings/global.proto";
import "frameworks/base/core/proto/android/providers/settings/secure.proto";
import "frameworks/base/core/proto/android/providers/settings/system.proto";
import "frameworks/base/libs/incident/proto/android/privacy.proto";
message SettingsServiceDumpProto {
@@ -48,111 +48,6 @@ message UserSettingsProto {
optional SystemSettingsProto system_settings = 3;
}
// Note: it's a conscious decision to add each setting as a separate field. This
// allows annotating each setting with its own privacy tag.
message SystemSettingsProto {
option (android.msg_privacy).dest = DEST_EXPLICIT;
repeated SettingsOperationProto historical_operations = 1;
optional SettingProto end_button_behavior = 2 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto advanced_settings = 3 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto bluetooth_discoverability = 4 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto bluetooth_discoverability_timeout = 5 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto font_scale = 6 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto system_locales = 7 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto display_color_mode = 8 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto screen_off_timeout = 9 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto screen_brightness = 10 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto screen_brightness_for_vr = 11 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto screen_brightness_mode = 12 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto screen_auto_brightness_adj = 13 [ (android.privacy).dest = DEST_AUTOMATIC ];
// Determines which streams are affected by ringer mode changes. The stream
// type's bit will be set to 1 if it should be muted when going into an
// inaudible ringer mode.
optional SettingProto mode_ringer_streams_affected = 14 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto mute_streams_affected = 15 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto vibrate_on = 16 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto vibrate_input_devices = 17 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto notification_vibration_intensity = 18 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto haptic_feedback_intensity = 19 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto volume_ring = 20 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto volume_system = 21 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto volume_voice = 22 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto volume_music = 23 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto volume_alarm = 24 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto volume_notification = 25 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto volume_bluetooth_sco = 26 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto volume_accessibility = 27 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto volume_master = 28 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto master_mono = 29 [ (android.privacy).dest = DEST_AUTOMATIC ];
// Whether silent mode should allow vibration feedback. This is used
// internally in AudioService and the Sound settings activity to coordinate
// decoupling of vibrate and silent modes. This setting will likely be
// removed in a future release with support for audio/vibe feedback
// profiles.
// Not used anymore. On devices with vibrator, the user explicitly selects
// silent or vibrate mode. Kept for use by legacy database upgrade code in
// DatabaseHelper.
optional SettingProto vibrate_in_silent = 30 [ (android.privacy).dest = DEST_AUTOMATIC ];
// Appended to various volume related settings to record the previous values
// before the settings were affected by a silent/vibrate ringer mode change.
optional SettingProto append_for_last_audible = 31 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto ringtone = 32;
optional SettingProto ringtone_cache = 33;
optional SettingProto notification_sound = 34;
optional SettingProto notification_sound_cache = 35;
optional SettingProto alarm_alert = 36;
optional SettingProto alarm_alert_cache = 37;
optional SettingProto media_button_receiver = 38;
optional SettingProto text_auto_replace = 39 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto text_auto_caps = 40 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto text_auto_punctuate = 41 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto text_show_password = 42 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto show_gtalk_service_status = 43 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto time_12_24 = 44 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto date_format = 45 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto setup_wizard_has_run = 46 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto accelerometer_rotation = 47 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto user_rotation = 48 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto hide_rotation_lock_toggle_for_accessibility = 49 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto vibrate_when_ringing = 50 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto dtmf_tone_when_dialing = 51 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto dtmf_tone_type_when_dialing = 52 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto hearing_aid = 53 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto tty_mode = 54 [ (android.privacy).dest = DEST_AUTOMATIC ];
// User-selected RTT mode. When on, outgoing and incoming calls will be
// answered as RTT calls when supported by the device and carrier. Boolean
// value.
optional SettingProto rtt_calling_mode = 55 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto sound_effects_enabled = 56 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto haptic_feedback_enabled = 57 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto notification_light_pulse = 58 [ (android.privacy).dest = DEST_AUTOMATIC ];
// Show pointer location on screen? 0 = no, 1 = yes.
optional SettingProto pointer_location = 59 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto show_touches = 60 [ (android.privacy).dest = DEST_AUTOMATIC ];
// Log raw orientation data from {@link
// com.android.server.policy.WindowOrientationListener} for use with the
// orientationplot.py tool.
// 0 = no, 1 = yes
optional SettingProto window_orientation_listener_log = 61 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto lockscreen_sounds_enabled = 62 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto lockscreen_disabled = 63 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto sip_receive_calls = 64 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto sip_call_options = 65 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto sip_always = 66 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto sip_address_only = 67 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto pointer_speed = 68 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto lock_to_app_enabled = 69 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto egg_mode = 70 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto show_battery_percent = 71 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto when_to_make_wifi_calls = 72 [ (android.privacy).dest = DEST_AUTOMATIC ];
// Please insert fields in the same order as in
// frameworks/base/core/java/android/provider/Settings.java.
// Next tag = 73;
}
message SettingsProto {
// Enum values gotten from Settings.java
enum ScreenBrightnessMode {

View File

@@ -0,0 +1,246 @@
/*
* Copyright (C) 2017 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
syntax = "proto2";
package android.providers.settings;
option java_multiple_files = true;
import "frameworks/base/core/proto/android/providers/settings/common.proto";
import "frameworks/base/libs/incident/proto/android/privacy.proto";
// Note: it's a conscious decision to add each setting as a separate field. This
// allows annotating each setting with its own privacy tag.
message SystemSettingsProto {
option (android.msg_privacy).dest = DEST_EXPLICIT;
repeated SettingsOperationProto historical_operations = 1;
optional SettingProto advanced_settings = 2 [ (android.privacy).dest = DEST_AUTOMATIC ];
message Alarm {
option (android.msg_privacy).dest = DEST_EXPLICIT;
// "alarm_alert" in code.
optional SettingProto default_uri = 1;
optional SettingProto alert_cache = 2;
}
optional Alarm alarm = 3;
message Bluetooth {
option (android.msg_privacy).dest = DEST_EXPLICIT;
// Whether remote devices may discover and/or connect to this device:
// 2 -- discoverable and connectable
// 1 -- connectable but not discoverable
// 0 -- neither connectable nor discoverable
optional SettingProto discoverability = 1 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto discoverability_timeout_secs = 2 [ (android.privacy).dest = DEST_AUTOMATIC ];
}
optional Bluetooth bluetooth = 4;
optional SettingProto date_format = 5 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto display_color_mode = 6 [ (android.privacy).dest = DEST_AUTOMATIC ];
message DevOptions {
option (android.msg_privacy).dest = DEST_EXPLICIT;
// Show pointer location on screen? 0 = no, 1 = yes. "pointer_location
// in code.
optional SettingProto pointer_location = 1 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto show_touches = 2 [ (android.privacy).dest = DEST_AUTOMATIC ];
// Log raw orientation data from {@link
// com.android.server.policy.WindowOrientationListener} for use with the
// orientationplot.py tool.
// 0 = no, 1 = yes
optional SettingProto window_orientation_listener_log = 3 [ (android.privacy).dest = DEST_AUTOMATIC ];
}
optional DevOptions developer_options = 7;
message DtmfTone {
option (android.msg_privacy).dest = DEST_EXPLICIT;
// "dtmf_tone_when_dialing" in code.
optional SettingProto play_when_dialing = 1 [ (android.privacy).dest = DEST_AUTOMATIC ];
// "dtmf_tone_type_when_dialing" in code.
optional SettingProto type_played_when_dialing = 2 [ (android.privacy).dest = DEST_AUTOMATIC ];
}
optional DtmfTone dtmf_tone = 8;
optional SettingProto egg_mode = 9 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto end_button_behavior = 10 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto font_scale = 11 [ (android.privacy).dest = DEST_AUTOMATIC ];
message HapticFeedback {
option (android.msg_privacy).dest = DEST_EXPLICIT;
optional SettingProto enabled = 1 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto intensity = 2 [ (android.privacy).dest = DEST_AUTOMATIC ];
}
optional HapticFeedback haptic_feedback = 12;
// Whether the hearing aid is enabled. The value is boolean (1 or 0).
optional SettingProto hearing_aid = 13 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto lock_to_app_enabled = 14 [ (android.privacy).dest = DEST_AUTOMATIC ];
message Lockscreen {
option (android.msg_privacy).dest = DEST_EXPLICIT;
optional SettingProto sounds_enabled = 1 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto disabled = 2 [ (android.privacy).dest = DEST_AUTOMATIC ];
}
optional Lockscreen lockscreen = 15;
// The system default media button event receiver.
optional SettingProto media_button_receiver = 16;
message Notification {
option (android.msg_privacy).dest = DEST_EXPLICIT;
optional SettingProto sound = 1;
optional SettingProto sound_cache = 2;
optional SettingProto light_pulse = 3 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto vibration_intensity = 4 [ (android.privacy).dest = DEST_AUTOMATIC ];
}
optional Notification notification = 17;
optional SettingProto pointer_speed = 18 [ (android.privacy).dest = DEST_AUTOMATIC ];
message Ringtone {
option (android.msg_privacy).dest = DEST_EXPLICIT;
// "ringtone" in code. The system-wide default ringtone URI.
optional SettingProto default_uri = 1;
optional SettingProto cache = 2;
}
optional Ringtone ringtone = 19;
message Rotation {
option (android.msg_privacy).dest = DEST_EXPLICIT;
// Control whether the accelerometer will be used to change screen
// orientation. If 0, it will not be used unless explicitly requested
// by the application; if 1, it will be used by default unless
// explicitly disabled by the application.
optional SettingProto accelerometer_rotation = 1 [ (android.privacy).dest = DEST_AUTOMATIC ];
// Default screen rotation when no other policy applies.
// When accelerometer_rotation is zero and no on-screen Activity expresses a
// preference, this rotation value will be used. Must be one of the
// {@link android.view.Surface#ROTATION_0 Surface rotation constants}.
optional SettingProto user_rotation = 2 [ (android.privacy).dest = DEST_AUTOMATIC ];
// Control whether the rotation lock toggle in the System UI should be hidden.
// Typically this is done for accessibility purposes to make it harder for
// the user to accidentally toggle the rotation lock while the display rotation
// has been locked for accessibility.
// If 0, then rotation lock toggle is not hidden for accessibility (although it may be
// unavailable for other reasons). If 1, then the rotation lock toggle is hidden.
optional SettingProto hide_rotation_lock_toggle_for_accessibility = 3 [ (android.privacy).dest = DEST_AUTOMATIC ];
}
optional Rotation rotation = 20;
// User-selected RTT mode. When on, outgoing and incoming calls will be
// answered as RTT calls when supported by the device and carrier. Boolean
// value.
optional SettingProto rtt_calling_mode = 21 [ (android.privacy).dest = DEST_AUTOMATIC ];
message Screen {
option (android.msg_privacy).dest = DEST_EXPLICIT;
optional SettingProto off_timeout = 1 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto brightness = 2 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto brightness_for_vr = 3 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto brightness_mode = 4 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto auto_brightness_adj = 5 [ (android.privacy).dest = DEST_AUTOMATIC ];
}
optional Screen screen = 22;
optional SettingProto setup_wizard_has_run = 23 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto show_battery_percent = 24 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto show_gtalk_service_status = 25 [ (android.privacy).dest = DEST_AUTOMATIC ];
message Sip {
option (android.msg_privacy).dest = DEST_EXPLICIT;
optional SettingProto receive_calls = 1 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto call_options = 2 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto always = 3 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto address_only = 4 [ (android.privacy).dest = DEST_AUTOMATIC ];
}
optional Sip sip = 26;
optional SettingProto sound_effects_enabled = 27 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto system_locales = 28 [ (android.privacy).dest = DEST_AUTOMATIC ];
message Text {
option (android.msg_privacy).dest = DEST_EXPLICIT;
optional SettingProto auto_replace = 1 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto auto_caps = 2 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto auto_punctuate = 3 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto show_password = 4 [ (android.privacy).dest = DEST_AUTOMATIC ];
}
optional Text text = 29;
optional SettingProto time_12_24 = 30 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto tty_mode = 31 [ (android.privacy).dest = DEST_AUTOMATIC ];
message Vibrate {
option (android.msg_privacy).dest = DEST_EXPLICIT;
optional SettingProto on = 1 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto input_devices = 2 [ (android.privacy).dest = DEST_AUTOMATIC ];
// Whether silent mode should allow vibration feedback. This is used
// internally in AudioService and the Sound settings activity to coordinate
// decoupling of vibrate and silent modes. This setting will likely be
// removed in a future release with support for audio/vibe feedback
// profiles.
// Not used anymore. On devices with vibrator, the user explicitly selects
// silent or vibrate mode. Kept for use by legacy database upgrade code in
// DatabaseHelper.
optional SettingProto in_silent = 3 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto when_ringing = 4 [ (android.privacy).dest = DEST_AUTOMATIC ];
}
optional Vibrate vibrate = 32;
message Volume {
option (android.msg_privacy).dest = DEST_EXPLICIT;
optional SettingProto ring = 1 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto system = 2 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto voice = 3 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto music = 4 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto alarm = 5 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto notification = 6 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto bluetooth_sco = 7 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto accessibility = 8 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto master = 9 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto master_mono = 10 [ (android.privacy).dest = DEST_AUTOMATIC ];
// Determines which streams are affected by ringer mode changes. The stream
// type's bit will be set to 1 if it should be muted when going into an
// inaudible ringer mode.
optional SettingProto mode_ringer_streams_affected = 11 [ (android.privacy).dest = DEST_AUTOMATIC ];
// Which streams are affected by mute. The stream type's bit should be set
// to 1 if it should be muted when a mute request is received.
optional SettingProto mute_streams_affected = 12 [ (android.privacy).dest = DEST_AUTOMATIC ];
}
optional Volume volume = 33;
optional SettingProto when_to_make_wifi_calls = 34 [ (android.privacy).dest = DEST_AUTOMATIC ];
// Please insert fields in alphabetical order and group them into messages
// if possible (to avoid reaching the method limit).
// Next tag = 35;
}

View File

@@ -2258,7 +2258,6 @@ class SettingsProtoDumpUtil {
// Please insert new settings using the same order as in SecureSettingsProto.
}
private static void dumpProtoSystemSettingsLocked(
@@ -2267,15 +2266,293 @@ class SettingsProtoDumpUtil {
s.dumpHistoricalOperations(p, SystemSettingsProto.HISTORICAL_OPERATIONS);
// This uses the same order as in Settings.System.
// This uses the same order as in SystemSettingsProto.
// Settings.System.STAY_ON_WHILE_PLUGGED_IN intentionally excluded since it's deprecated.
dumpSetting(s, p,
Settings.System.ADVANCED_SETTINGS,
SystemSettingsProto.ADVANCED_SETTINGS);
final long alarmToken = p.start(SystemSettingsProto.ALARM);
dumpSetting(s, p,
Settings.System.ALARM_ALERT,
SystemSettingsProto.Alarm.DEFAULT_URI);
dumpSetting(s, p,
Settings.System.ALARM_ALERT_CACHE,
SystemSettingsProto.Alarm.ALERT_CACHE);
// Settings.System.NEXT_ALARM_FORMATTED intentionally excluded since it's deprecated.
p.end(alarmToken);
final long bluetoothToken = p.start(SystemSettingsProto.BLUETOOTH);
dumpSetting(s, p,
Settings.System.BLUETOOTH_DISCOVERABILITY,
SystemSettingsProto.Bluetooth.DISCOVERABILITY);
dumpSetting(s, p,
Settings.System.BLUETOOTH_DISCOVERABILITY_TIMEOUT,
SystemSettingsProto.Bluetooth.DISCOVERABILITY_TIMEOUT_SECS);
p.end(bluetoothToken);
dumpSetting(s, p,
Settings.System.DATE_FORMAT,
SystemSettingsProto.DATE_FORMAT);
dumpSetting(s, p,
Settings.System.DISPLAY_COLOR_MODE,
SystemSettingsProto.DISPLAY_COLOR_MODE);
final long devOptionsToken = p.start(SystemSettingsProto.DEVELOPER_OPTIONS);
dumpSetting(s, p,
Settings.System.SHOW_TOUCHES,
SystemSettingsProto.DevOptions.SHOW_TOUCHES);
dumpSetting(s, p,
Settings.System.POINTER_LOCATION,
SystemSettingsProto.DevOptions.POINTER_LOCATION);
dumpSetting(s, p,
Settings.System.WINDOW_ORIENTATION_LISTENER_LOG,
SystemSettingsProto.DevOptions.WINDOW_ORIENTATION_LISTENER_LOG);
p.end(devOptionsToken);
final long dtmfToneToken = p.start(SystemSettingsProto.DTMF_TONE);
dumpSetting(s, p,
Settings.System.DTMF_TONE_WHEN_DIALING,
SystemSettingsProto.DtmfTone.PLAY_WHEN_DIALING);
dumpSetting(s, p,
Settings.System.DTMF_TONE_TYPE_WHEN_DIALING,
SystemSettingsProto.DtmfTone.TYPE_PLAYED_WHEN_DIALING);
p.end(dtmfToneToken);
dumpSetting(s, p,
Settings.System.EGG_MODE,
SystemSettingsProto.EGG_MODE);
dumpSetting(s, p,
Settings.System.END_BUTTON_BEHAVIOR,
SystemSettingsProto.END_BUTTON_BEHAVIOR);
dumpSetting(s, p,
Settings.System.ADVANCED_SETTINGS,
SystemSettingsProto.ADVANCED_SETTINGS);
Settings.System.FONT_SCALE,
SystemSettingsProto.FONT_SCALE);
final long hapticFeedbackToken = p.start(SystemSettingsProto.HAPTIC_FEEDBACK);
dumpSetting(s, p,
Settings.System.HAPTIC_FEEDBACK_ENABLED,
SystemSettingsProto.HapticFeedback.ENABLED);
dumpSetting(s, p,
Settings.System.HAPTIC_FEEDBACK_INTENSITY,
SystemSettingsProto.HapticFeedback.INTENSITY);
p.end(hapticFeedbackToken);
dumpSetting(s, p,
Settings.System.HEARING_AID,
SystemSettingsProto.HEARING_AID);
dumpSetting(s, p,
Settings.System.LOCK_TO_APP_ENABLED,
SystemSettingsProto.LOCK_TO_APP_ENABLED);
final long lockscreenToken = p.start(SystemSettingsProto.LOCKSCREEN);
dumpSetting(s, p,
Settings.System.LOCKSCREEN_SOUNDS_ENABLED,
SystemSettingsProto.Lockscreen.SOUNDS_ENABLED);
dumpSetting(s, p,
Settings.System.LOCKSCREEN_DISABLED,
SystemSettingsProto.Lockscreen.DISABLED);
p.end(lockscreenToken);
dumpSetting(s, p,
Settings.System.MEDIA_BUTTON_RECEIVER,
SystemSettingsProto.MEDIA_BUTTON_RECEIVER);
final long notificationToken = p.start(SystemSettingsProto.NOTIFICATION);
dumpSetting(s, p,
Settings.System.NOTIFICATION_SOUND,
SystemSettingsProto.Notification.SOUND);
dumpSetting(s, p,
Settings.System.NOTIFICATION_SOUND_CACHE,
SystemSettingsProto.Notification.SOUND_CACHE);
dumpSetting(s, p,
Settings.System.NOTIFICATION_LIGHT_PULSE,
SystemSettingsProto.Notification.LIGHT_PULSE);
dumpSetting(s, p,
Settings.System.NOTIFICATION_VIBRATION_INTENSITY,
SystemSettingsProto.Notification.VIBRATION_INTENSITY);
// Settings.System.NOTIFICATIONS_USE_RING_VOLUME intentionally excluded since it's deprecated.
p.end(notificationToken);
dumpSetting(s, p,
Settings.System.POINTER_SPEED,
SystemSettingsProto.POINTER_SPEED);
final long ringtoneToken = p.start(SystemSettingsProto.RINGTONE);
dumpSetting(s, p,
Settings.System.RINGTONE,
SystemSettingsProto.Ringtone.DEFAULT_URI);
dumpSetting(s, p,
Settings.System.RINGTONE_CACHE,
SystemSettingsProto.Ringtone.CACHE);
p.end(ringtoneToken);
final long rotationToken = p.start(SystemSettingsProto.ROTATION);
dumpSetting(s, p,
Settings.System.ACCELEROMETER_ROTATION,
SystemSettingsProto.Rotation.ACCELEROMETER_ROTATION);
dumpSetting(s, p,
Settings.System.USER_ROTATION,
SystemSettingsProto.Rotation.USER_ROTATION);
dumpSetting(s, p,
Settings.System.HIDE_ROTATION_LOCK_TOGGLE_FOR_ACCESSIBILITY,
SystemSettingsProto.Rotation.HIDE_ROTATION_LOCK_TOGGLE_FOR_ACCESSIBILITY);
p.end(rotationToken);
dumpSetting(s, p,
Settings.System.RTT_CALLING_MODE,
SystemSettingsProto.RTT_CALLING_MODE);
final long screenToken = p.start(SystemSettingsProto.SCREEN);
dumpSetting(s, p,
Settings.System.SCREEN_OFF_TIMEOUT,
SystemSettingsProto.Screen.OFF_TIMEOUT);
dumpSetting(s, p,
Settings.System.SCREEN_BRIGHTNESS,
SystemSettingsProto.Screen.BRIGHTNESS);
dumpSetting(s, p,
Settings.System.SCREEN_BRIGHTNESS_FOR_VR,
SystemSettingsProto.Screen.BRIGHTNESS_FOR_VR);
dumpSetting(s, p,
Settings.System.SCREEN_BRIGHTNESS_MODE,
SystemSettingsProto.Screen.BRIGHTNESS_MODE);
dumpSetting(s, p,
Settings.System.SCREEN_AUTO_BRIGHTNESS_ADJ,
SystemSettingsProto.Screen.AUTO_BRIGHTNESS_ADJ);
p.end(screenToken);
dumpSetting(s, p,
Settings.System.SETUP_WIZARD_HAS_RUN,
SystemSettingsProto.SETUP_WIZARD_HAS_RUN);
dumpSetting(s, p,
Settings.System.SHOW_BATTERY_PERCENT,
SystemSettingsProto.SHOW_BATTERY_PERCENT);
dumpSetting(s, p,
Settings.System.SHOW_GTALK_SERVICE_STATUS,
SystemSettingsProto.SHOW_GTALK_SERVICE_STATUS);
// Settings.System.SHOW_PROCESSES intentionally excluded since it's deprecated.
// Settings.System.SHOW_WEB_SUGGESTIONS intentionally excluded since it's deprecated.
final long sipToken = p.start(SystemSettingsProto.SIP);
dumpSetting(s, p,
Settings.System.SIP_RECEIVE_CALLS,
SystemSettingsProto.Sip.RECEIVE_CALLS);
dumpSetting(s, p,
Settings.System.SIP_CALL_OPTIONS,
SystemSettingsProto.Sip.CALL_OPTIONS);
dumpSetting(s, p,
Settings.System.SIP_ALWAYS,
SystemSettingsProto.Sip.ALWAYS);
dumpSetting(s, p,
Settings.System.SIP_ADDRESS_ONLY,
SystemSettingsProto.Sip.ADDRESS_ONLY);
// Settings.System.SIP_ASK_ME_EACH_TIME intentionally excluded since it's deprecated.
p.end(sipToken);
dumpSetting(s, p,
Settings.System.SOUND_EFFECTS_ENABLED,
SystemSettingsProto.SOUND_EFFECTS_ENABLED);
// Settings.System.POWER_SOUNDS_ENABLED intentionally excluded since it's deprecated.
// Settings.System.DOCK_SOUNDS_ENABLED intentionally excluded since it's deprecated.
// Settings.System.LOW_BATTERY_SOUND intentionally excluded since it's deprecated.
// Settings.System.DESK_DOCK_SOUND intentionally excluded since it's deprecated.
// Settings.System.DESK_UNDOCK_SOUND intentionally excluded since it's deprecated.
// Settings.System.CAR_DOCK_SOUND intentionally excluded since it's deprecated.
// Settings.System.CAR_UNDOCK_SOUND intentionally excluded since it's deprecated.
// Settings.System.LOCK_SOUND intentionally excluded since it's deprecated.
// Settings.System.UNLOCK_SOUND intentionally excluded since it's deprecated.
dumpSetting(s, p,
Settings.System.SYSTEM_LOCALES,
SystemSettingsProto.SYSTEM_LOCALES);
final long textToken = p.start(SystemSettingsProto.TEXT);
dumpSetting(s, p,
Settings.System.TEXT_AUTO_REPLACE,
SystemSettingsProto.Text.AUTO_REPLACE);
dumpSetting(s, p,
Settings.System.TEXT_AUTO_CAPS,
SystemSettingsProto.Text.AUTO_CAPS);
dumpSetting(s, p,
Settings.System.TEXT_AUTO_PUNCTUATE,
SystemSettingsProto.Text.AUTO_PUNCTUATE);
dumpSetting(s, p,
Settings.System.TEXT_SHOW_PASSWORD,
SystemSettingsProto.Text.SHOW_PASSWORD);
p.end(textToken);
// Settings.System.AUTO_TIME intentionally excluded since it's deprecated.
// Settings.System.AUTO_TIME_ZONE intentionally excluded since it's deprecated.
dumpSetting(s, p,
Settings.System.TIME_12_24,
SystemSettingsProto.TIME_12_24);
dumpSetting(s, p,
Settings.System.TTY_MODE,
SystemSettingsProto.TTY_MODE);
final long vibrateToken = p.start(SystemSettingsProto.VIBRATE);
dumpSetting(s, p,
Settings.System.VIBRATE_ON,
SystemSettingsProto.Vibrate.ON);
dumpSetting(s, p,
Settings.System.VIBRATE_INPUT_DEVICES,
SystemSettingsProto.Vibrate.INPUT_DEVICES);
dumpSetting(s, p,
Settings.System.VIBRATE_IN_SILENT,
SystemSettingsProto.Vibrate.IN_SILENT);
dumpSetting(s, p,
Settings.System.VIBRATE_WHEN_RINGING,
SystemSettingsProto.Vibrate.WHEN_RINGING);
p.end(vibrateToken);
final long volumeToken = p.start(SystemSettingsProto.VOLUME);
dumpSetting(s, p,
Settings.System.VOLUME_RING,
SystemSettingsProto.Volume.RING);
dumpSetting(s, p,
Settings.System.VOLUME_SYSTEM,
SystemSettingsProto.Volume.SYSTEM);
dumpSetting(s, p,
Settings.System.VOLUME_VOICE,
SystemSettingsProto.Volume.VOICE);
dumpSetting(s, p,
Settings.System.VOLUME_MUSIC,
SystemSettingsProto.Volume.MUSIC);
dumpSetting(s, p,
Settings.System.VOLUME_ALARM,
SystemSettingsProto.Volume.ALARM);
dumpSetting(s, p,
Settings.System.VOLUME_NOTIFICATION,
SystemSettingsProto.Volume.NOTIFICATION);
dumpSetting(s, p,
Settings.System.VOLUME_BLUETOOTH_SCO,
SystemSettingsProto.Volume.BLUETOOTH_SCO);
dumpSetting(s, p,
Settings.System.VOLUME_ACCESSIBILITY,
SystemSettingsProto.Volume.ACCESSIBILITY);
dumpSetting(s, p,
Settings.System.VOLUME_MASTER,
SystemSettingsProto.Volume.MASTER);
dumpSetting(s, p,
Settings.System.MASTER_MONO,
SystemSettingsProto.Volume.MASTER_MONO);
dumpSetting(s, p,
Settings.System.MODE_RINGER_STREAMS_AFFECTED,
SystemSettingsProto.Volume.MODE_RINGER_STREAMS_AFFECTED);
dumpSetting(s, p,
Settings.System.MUTE_STREAMS_AFFECTED,
SystemSettingsProto.Volume.MUTE_STREAMS_AFFECTED);
p.end(volumeToken);
dumpSetting(s, p,
Settings.System.WHEN_TO_MAKE_WIFI_CALLS,
SystemSettingsProto.WHEN_TO_MAKE_WIFI_CALLS);
// Please insert new settings using the same order as in SecureSettingsProto.
// The rest of the settings were moved to Settings.Secure, and are thus excluded here since
// they're deprecated from Settings.System.
// Settings.System.STAY_ON_WHILE_PLUGGED_IN intentionally excluded since it's deprecated.
// Settings.System.AIRPLANE_MODE_ON intentionally excluded since it's deprecated.
// Settings.System.RADIO_BLUETOOTH intentionally excluded since it's just a constant.
// Settings.System.RADIO_WIFI intentionally excluded since it's just a constant.
@@ -2292,245 +2569,24 @@ class SettingsProtoDumpUtil {
// Settings.System.WIFI_STATIC_NETMASK intentionally excluded since it's deprecated.
// Settings.System.WIFI_STATIC_DNS1 intentionally excluded since it's deprecated.
// Settings.System.WIFI_STATIC_DNS2 intentionally excluded since it's deprecated.
dumpSetting(s, p,
Settings.System.BLUETOOTH_DISCOVERABILITY,
SystemSettingsProto.BLUETOOTH_DISCOVERABILITY);
dumpSetting(s, p,
Settings.System.BLUETOOTH_DISCOVERABILITY_TIMEOUT,
SystemSettingsProto.BLUETOOTH_DISCOVERABILITY_TIMEOUT);
// Settings.System.LOCK_PATTERN_ENABLED intentionally excluded since it's deprecated.
// Settings.System.LOCK_PATTERN_VISIBLE intentionally excluded since it's deprecated.
// Settings.System.LOCK_PATTERN_TACTILE_FEEDBACK_ENABLED intentionally excluded since it's deprecated.
// Settings.System.NEXT_ALARM_FORMATTED intentionally excluded since it's deprecated.
dumpSetting(s, p,
Settings.System.FONT_SCALE,
SystemSettingsProto.FONT_SCALE);
dumpSetting(s, p,
Settings.System.SYSTEM_LOCALES,
SystemSettingsProto.SYSTEM_LOCALES);
// Settings.System.DEBUG_APP intentionally excluded since it's deprecated.
// Settings.System.WAIT_FOR_DEBUGGER intentionally excluded since it's deprecated.
// Settings.System.DIM_SCREEN intentionally excluded since it's deprecated.
dumpSetting(s, p,
Settings.System.DISPLAY_COLOR_MODE,
SystemSettingsProto.DISPLAY_COLOR_MODE);
dumpSetting(s, p,
Settings.System.SCREEN_OFF_TIMEOUT,
SystemSettingsProto.SCREEN_OFF_TIMEOUT);
dumpSetting(s, p,
Settings.System.SCREEN_BRIGHTNESS,
SystemSettingsProto.SCREEN_BRIGHTNESS);
dumpSetting(s, p,
Settings.System.SCREEN_BRIGHTNESS_FOR_VR,
SystemSettingsProto.SCREEN_BRIGHTNESS_FOR_VR);
dumpSetting(s, p,
Settings.System.SCREEN_BRIGHTNESS_MODE,
SystemSettingsProto.SCREEN_BRIGHTNESS_MODE);
dumpSetting(s, p,
Settings.System.SCREEN_AUTO_BRIGHTNESS_ADJ,
SystemSettingsProto.SCREEN_AUTO_BRIGHTNESS_ADJ);
// Settings.System.SHOW_PROCESSES intentionally excluded since it's deprecated.
// Settings.System.ALWAYS_FINISH_ACTIVITIES intentionally excluded since it's deprecated.
dumpSetting(s, p,
Settings.System.MODE_RINGER_STREAMS_AFFECTED,
SystemSettingsProto.MODE_RINGER_STREAMS_AFFECTED);
dumpSetting(s, p,
Settings.System.MUTE_STREAMS_AFFECTED,
SystemSettingsProto.MUTE_STREAMS_AFFECTED);
dumpSetting(s, p,
Settings.System.VIBRATE_ON,
SystemSettingsProto.VIBRATE_ON);
dumpSetting(s, p,
Settings.System.VIBRATE_INPUT_DEVICES,
SystemSettingsProto.VIBRATE_INPUT_DEVICES);
dumpSetting(s, p,
Settings.System.NOTIFICATION_VIBRATION_INTENSITY,
SystemSettingsProto.NOTIFICATION_VIBRATION_INTENSITY);
dumpSetting(s, p,
Settings.System.HAPTIC_FEEDBACK_INTENSITY,
SystemSettingsProto.HAPTIC_FEEDBACK_INTENSITY);
dumpSetting(s, p,
Settings.System.VOLUME_RING,
SystemSettingsProto.VOLUME_RING);
dumpSetting(s, p,
Settings.System.VOLUME_SYSTEM,
SystemSettingsProto.VOLUME_SYSTEM);
dumpSetting(s, p,
Settings.System.VOLUME_VOICE,
SystemSettingsProto.VOLUME_VOICE);
dumpSetting(s, p,
Settings.System.VOLUME_MUSIC,
SystemSettingsProto.VOLUME_MUSIC);
dumpSetting(s, p,
Settings.System.VOLUME_ALARM,
SystemSettingsProto.VOLUME_ALARM);
dumpSetting(s, p,
Settings.System.VOLUME_NOTIFICATION,
SystemSettingsProto.VOLUME_NOTIFICATION);
dumpSetting(s, p,
Settings.System.VOLUME_BLUETOOTH_SCO,
SystemSettingsProto.VOLUME_BLUETOOTH_SCO);
dumpSetting(s, p,
Settings.System.VOLUME_ACCESSIBILITY,
SystemSettingsProto.VOLUME_ACCESSIBILITY);
dumpSetting(s, p,
Settings.System.VOLUME_MASTER,
SystemSettingsProto.VOLUME_MASTER);
dumpSetting(s, p,
Settings.System.MASTER_MONO,
SystemSettingsProto.MASTER_MONO);
// Settings.System.NOTIFICATIONS_USE_RING_VOLUME intentionally excluded since it's deprecated.
dumpSetting(s, p,
Settings.System.VIBRATE_IN_SILENT,
SystemSettingsProto.VIBRATE_IN_SILENT);
dumpSetting(s, p,
Settings.System.APPEND_FOR_LAST_AUDIBLE,
SystemSettingsProto.APPEND_FOR_LAST_AUDIBLE);
dumpSetting(s, p,
Settings.System.RINGTONE,
SystemSettingsProto.RINGTONE);
dumpSetting(s, p,
Settings.System.RINGTONE_CACHE,
SystemSettingsProto.RINGTONE_CACHE);
dumpSetting(s, p,
Settings.System.NOTIFICATION_SOUND,
SystemSettingsProto.NOTIFICATION_SOUND);
dumpSetting(s, p,
Settings.System.NOTIFICATION_SOUND_CACHE,
SystemSettingsProto.NOTIFICATION_SOUND_CACHE);
dumpSetting(s, p,
Settings.System.ALARM_ALERT,
SystemSettingsProto.ALARM_ALERT);
dumpSetting(s, p,
Settings.System.ALARM_ALERT_CACHE,
SystemSettingsProto.ALARM_ALERT_CACHE);
dumpSetting(s, p,
Settings.System.MEDIA_BUTTON_RECEIVER,
SystemSettingsProto.MEDIA_BUTTON_RECEIVER);
dumpSetting(s, p,
Settings.System.TEXT_AUTO_REPLACE,
SystemSettingsProto.TEXT_AUTO_REPLACE);
dumpSetting(s, p,
Settings.System.TEXT_AUTO_CAPS,
SystemSettingsProto.TEXT_AUTO_CAPS);
dumpSetting(s, p,
Settings.System.TEXT_AUTO_PUNCTUATE,
SystemSettingsProto.TEXT_AUTO_PUNCTUATE);
dumpSetting(s, p,
Settings.System.TEXT_SHOW_PASSWORD,
SystemSettingsProto.TEXT_SHOW_PASSWORD);
dumpSetting(s, p,
Settings.System.SHOW_GTALK_SERVICE_STATUS,
SystemSettingsProto.SHOW_GTALK_SERVICE_STATUS);
// Settings.System.APPEND_FOR_LAST_AUDIBLE intentionally excluded since it hasn't been used since API 2.
// Settings.System.WALLPAPER_ACTIVITY intentionally excluded since it's deprecated.
// Settings.System.AUTO_TIME intentionally excluded since it's deprecated.
// Settings.System.AUTO_TIME_ZONE intentionally excluded since it's deprecated.
dumpSetting(s, p,
Settings.System.TIME_12_24,
SystemSettingsProto.TIME_12_24);
dumpSetting(s, p,
Settings.System.DATE_FORMAT,
SystemSettingsProto.DATE_FORMAT);
dumpSetting(s, p,
Settings.System.SETUP_WIZARD_HAS_RUN,
SystemSettingsProto.SETUP_WIZARD_HAS_RUN);
// Settings.System.WINDOW_ANIMATION_SCALE intentionally excluded since it's deprecated.
// Settings.System.TRANSITION_ANIMATION_SCALE intentionally excluded since it's deprecated.
// Settings.System.ANIMATOR_ANIMATION_SCALE intentionally excluded since it's deprecated.
dumpSetting(s, p,
Settings.System.ACCELEROMETER_ROTATION,
SystemSettingsProto.ACCELEROMETER_ROTATION);
dumpSetting(s, p,
Settings.System.USER_ROTATION,
SystemSettingsProto.USER_ROTATION);
dumpSetting(s, p,
Settings.System.HIDE_ROTATION_LOCK_TOGGLE_FOR_ACCESSIBILITY,
SystemSettingsProto.HIDE_ROTATION_LOCK_TOGGLE_FOR_ACCESSIBILITY);
dumpSetting(s, p,
Settings.System.VIBRATE_WHEN_RINGING,
SystemSettingsProto.VIBRATE_WHEN_RINGING);
dumpSetting(s, p,
Settings.System.DTMF_TONE_WHEN_DIALING,
SystemSettingsProto.DTMF_TONE_WHEN_DIALING);
dumpSetting(s, p,
Settings.System.DTMF_TONE_TYPE_WHEN_DIALING,
SystemSettingsProto.DTMF_TONE_TYPE_WHEN_DIALING);
dumpSetting(s, p,
Settings.System.HEARING_AID,
SystemSettingsProto.HEARING_AID);
dumpSetting(s, p,
Settings.System.TTY_MODE,
SystemSettingsProto.TTY_MODE);
dumpSetting(s, p,
Settings.System.RTT_CALLING_MODE,
SystemSettingsProto.RTT_CALLING_MODE);
dumpSetting(s, p,
Settings.System.SOUND_EFFECTS_ENABLED,
SystemSettingsProto.SOUND_EFFECTS_ENABLED);
dumpSetting(s, p,
Settings.System.HAPTIC_FEEDBACK_ENABLED,
SystemSettingsProto.HAPTIC_FEEDBACK_ENABLED);
// Settings.System.SHOW_WEB_SUGGESTIONS intentionally excluded since it's deprecated.
dumpSetting(s, p,
Settings.System.NOTIFICATION_LIGHT_PULSE,
SystemSettingsProto.NOTIFICATION_LIGHT_PULSE);
dumpSetting(s, p,
Settings.System.POINTER_LOCATION,
SystemSettingsProto.POINTER_LOCATION);
dumpSetting(s, p,
Settings.System.SHOW_TOUCHES,
SystemSettingsProto.SHOW_TOUCHES);
dumpSetting(s, p,
Settings.System.WINDOW_ORIENTATION_LISTENER_LOG,
SystemSettingsProto.WINDOW_ORIENTATION_LISTENER_LOG);
// Settings.System.POWER_SOUNDS_ENABLED intentionally excluded since it's deprecated.
// Settings.System.DOCK_SOUNDS_ENABLED intentionally excluded since it's deprecated.
dumpSetting(s, p,
Settings.System.LOCKSCREEN_SOUNDS_ENABLED,
SystemSettingsProto.LOCKSCREEN_SOUNDS_ENABLED);
dumpSetting(s, p,
Settings.System.LOCKSCREEN_DISABLED,
SystemSettingsProto.LOCKSCREEN_DISABLED);
// Settings.System.LOW_BATTERY_SOUND intentionally excluded since it's deprecated.
// Settings.System.DESK_DOCK_SOUND intentionally excluded since it's deprecated.
// Settings.System.DESK_UNDOCK_SOUND intentionally excluded since it's deprecated.
// Settings.System.CAR_DOCK_SOUND intentionally excluded since it's deprecated.
// Settings.System.CAR_UNDOCK_SOUND intentionally excluded since it's deprecated.
// Settings.System.LOCK_SOUND intentionally excluded since it's deprecated.
// Settings.System.UNLOCK_SOUND intentionally excluded since it's deprecated.
dumpSetting(s, p,
Settings.System.SIP_RECEIVE_CALLS,
SystemSettingsProto.SIP_RECEIVE_CALLS);
dumpSetting(s, p,
Settings.System.SIP_CALL_OPTIONS,
SystemSettingsProto.SIP_CALL_OPTIONS);
dumpSetting(s, p,
Settings.System.SIP_ALWAYS,
SystemSettingsProto.SIP_ALWAYS);
dumpSetting(s, p,
Settings.System.SIP_ADDRESS_ONLY,
SystemSettingsProto.SIP_ADDRESS_ONLY);
// Settings.System.SIP_ASK_ME_EACH_TIME intentionally excluded since it's deprecated.
dumpSetting(s, p,
Settings.System.POINTER_SPEED,
SystemSettingsProto.POINTER_SPEED);
dumpSetting(s, p,
Settings.System.LOCK_TO_APP_ENABLED,
SystemSettingsProto.LOCK_TO_APP_ENABLED);
dumpSetting(s, p,
Settings.System.EGG_MODE,
SystemSettingsProto.EGG_MODE);
dumpSetting(s, p,
Settings.System.SHOW_BATTERY_PERCENT,
SystemSettingsProto.SHOW_BATTERY_PERCENT);
dumpSetting(s, p,
Settings.System.WHEN_TO_MAKE_WIFI_CALLS,
SystemSettingsProto.WHEN_TO_MAKE_WIFI_CALLS);
// The rest of the settings were moved to Settings.Secure, and are thus excluded here since
// they're deprecated from Settings.System.
// Please insert new settings using the same order as in Settings.System.
// Please insert new settings using the same order as in SecureSettingsProto.
p.end(token);
// Please insert new settings using the same order as in SecureSettingsProto.
}
}