From 5555c00e616ed9873328e7f14a9a9172a56ddc43 Mon Sep 17 00:00:00 2001 From: paulhu Date: Fri, 3 Dec 2021 22:19:44 +0800 Subject: [PATCH] Remove NSD_ON setting NSD_ON setting has never been set since it created. The NsdService is the only user which read/write the setting. However, NsdManager cts test must running with nsd service enabled that means this setting should be enabled always. And this setting is the hidden symbols that NsdService can't use it after move to mainline module. Thus, remove this useless setting. Bug: 206702844 Test: m Change-Id: Idb5dfc71ebfe2eacd476dd8646aad9adc4975149 --- core/java/android/provider/Settings.java | 8 -------- core/proto/android/providers/settings/global.proto | 2 -- .../com/android/providers/settings/DatabaseHelper.java | 1 - .../android/providers/settings/SettingsProtoDumpUtil.java | 4 ---- .../test/src/android/provider/SettingsBackupTest.java | 1 - 5 files changed, 16 deletions(-) diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 2d70bad39c85b..d0ef546a81226 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -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. diff --git a/core/proto/android/providers/settings/global.proto b/core/proto/android/providers/settings/global.proto index ca9124a782048..e035ab1511906 100644 --- a/core/proto/android/providers/settings/global.proto +++ b/core/proto/android/providers/settings/global.proto @@ -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; diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java index 268603fa8b0d7..200e902c64206 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java @@ -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, diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java index f145f508da2ec..63c874a08621e 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java @@ -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); diff --git a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java index 883c4a1cd936e..10dafd93c18ec 100644 --- a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java +++ b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java @@ -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,