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

Commit 5555c00e authored by paulhu's avatar paulhu
Browse files

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
parent 6ff62406

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.

































core/proto/android/providers/settings/global.proto



+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;

















































packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java



+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,

































packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java



+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);

































packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java



+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,