Merge "Remove NSD_ON setting" (02124fb1) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+0 −8

Original line number	Diff line number	Diff line
		@@ -5756,7 +5756,6 @@ public final class Settings {
		MOVED_TO_GLOBAL.add(Settings.Global.CONNECTIVITY_CHANGE_DELAY);
		MOVED_TO_GLOBAL.add(Settings.Global.CAPTIVE_PORTAL_DETECTION_ENABLED);
		MOVED_TO_GLOBAL.add(Settings.Global.CAPTIVE_PORTAL_SERVER);
		MOVED_TO_GLOBAL.add(Settings.Global.NSD_ON);
		MOVED_TO_GLOBAL.add(Settings.Global.SET_INSTALL_LOCATION);
		MOVED_TO_GLOBAL.add(Settings.Global.DEFAULT_INSTALL_LOCATION);
		MOVED_TO_GLOBAL.add(Settings.Global.INET_CONDITION_DEBOUNCE_UP_DELAY);
		@@ -12631,13 +12630,6 @@ public final class Settings {
		@Readable
		public static final String MIN_DURATION_BETWEEN_RECOVERY_STEPS_IN_MS =
		"min_duration_between_recovery_steps";
		/**
		* Whether network service discovery is enabled.
		*
		* @hide
		*/
		@Readable
		public static final String NSD_ON = "nsd_on";

		/**
		* Let user pick default install location.

+0 −2

Original line number	Diff line number	Diff line
		@@ -716,8 +716,6 @@ message GlobalSettingsProto {

		optional SettingProto nr_nsa_tracking_screen_off_mode = 153 [ (android.privacy).dest = DEST_AUTOMATIC ];

		optional SettingProto nsd_on = 83 [ (android.privacy).dest = DEST_AUTOMATIC ];

		message Ntp {
		option (android.msg_privacy).dest = DEST_EXPLICIT;

+0 −1

Original line number	Diff line number	Diff line
		@@ -1348,7 +1348,6 @@ class DatabaseHelper extends SQLiteOpenHelper {
		Settings.Global.CONNECTIVITY_CHANGE_DELAY,
		Settings.Global.CAPTIVE_PORTAL_DETECTION_ENABLED,
		Settings.Global.CAPTIVE_PORTAL_SERVER,
		Settings.Global.NSD_ON,
		Settings.Global.SET_INSTALL_LOCATION,
		Settings.Global.DEFAULT_INSTALL_LOCATION,
		Settings.Global.INET_CONDITION_DEBOUNCE_UP_DELAY,

+0 −4

Original line number	Diff line number	Diff line
		@@ -1114,10 +1114,6 @@ class SettingsProtoDumpUtil {
		GlobalSettingsProto.Notification.SMART_SUGGESTIONS_IN_NOTIFICATIONS_FLAGS);
		p.end(notificationToken);

		dumpSetting(s, p,
		Settings.Global.NSD_ON,
		GlobalSettingsProto.NSD_ON);

		dumpSetting(s, p,
		Settings.Global.NR_NSA_TRACKING_SCREEN_OFF_MODE,
		GlobalSettingsProto.NR_NSA_TRACKING_SCREEN_OFF_MODE);

+0 −1

Original line number	Diff line number	Diff line
		@@ -394,7 +394,6 @@ public class SettingsBackupTest {
		Settings.Global.NOTIFICATION_SNOOZE_OPTIONS,
		Settings.Global.NOTIFICATION_FEEDBACK_ENABLED,
		Settings.Global.NR_NSA_TRACKING_SCREEN_OFF_MODE,
		Settings.Global.NSD_ON,
		Settings.Global.NTP_SERVER,
		Settings.Global.NTP_TIMEOUT,
		Settings.Global.OTA_DISABLE_AUTOMATIC_UPDATE,