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

Commit 963c1e26 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Settings: Remove SamplingProfiler vestiges"

parents f9d0d007 79ac25b5

core/java/android/provider/Settings.java

+0 −10
Original line number Diff line number Diff line
@@ -4581,7 +4581,6 @@ public final class Settings { 
            MOVED_TO_GLOBAL.add(Settings.Global.PDP_WATCHDOG_MAX_PDP_RESET_FAIL_COUNT);

            MOVED_TO_GLOBAL.add(Settings.Global.PDP_WATCHDOG_POLL_INTERVAL_MS);

            MOVED_TO_GLOBAL.add(Settings.Global.PDP_WATCHDOG_TRIGGER_PACKET_COUNT);

            MOVED_TO_GLOBAL.add(Settings.Global.SAMPLING_PROFILER_MS);

            MOVED_TO_GLOBAL.add(Settings.Global.SETUP_PREPAID_DATA_SERVICE_URL);

            MOVED_TO_GLOBAL.add(Settings.Global.SETUP_PREPAID_DETECTION_REDIR_HOST);

            MOVED_TO_GLOBAL.add(Settings.Global.SETUP_PREPAID_DETECTION_TARGET_URL);
@@ -8213,15 +8212,6 @@ public final class Settings { 
       public static final String PDP_WATCHDOG_MAX_PDP_RESET_FAIL_COUNT =

               "pdp_watchdog_max_pdp_reset_fail_count";



       /**

        * A positive value indicates how often the SamplingProfiler

        * should take snapshots. Zero value means SamplingProfiler

        * is disabled.

        *

        * @hide

        */

       public static final String SAMPLING_PROFILER_MS = "sampling_profiler_ms";



       /**

        * URL to open browser on to allow user to manage a prepay account

        * @hide

core/proto/android/providers/settings.proto

+0 −1
Original line number Diff line number Diff line
@@ -146,7 +146,6 @@ message GlobalSettingsProto { 
    SettingProto pdp_watchdog_trigger_packet_count = 101;

    SettingProto pdp_watchdog_error_poll_count = 102;

    SettingProto pdp_watchdog_max_pdp_reset_fail_count = 103;

    SettingProto sampling_profiler_ms = 104;

    SettingProto setup_prepaid_data_service_url = 105;

    SettingProto setup_prepaid_detection_target_url = 106;

    SettingProto setup_prepaid_detection_redir_host = 107;

core/tests/coretests/src/android/provider/SettingsBackupTest.java

+0 −1
Original line number Diff line number Diff line
@@ -305,7 +305,6 @@ public class SettingsBackupTest { 
                    Settings.Global.READ_EXTERNAL_STORAGE_ENFORCED_DEFAULT,

                    Settings.Global.REQUIRE_PASSWORD_TO_DECRYPT,

                    Settings.Global.SAFE_BOOT_DISALLOWED,

                    Settings.Global.SAMPLING_PROFILER_MS,

                    Settings.Global.SELINUX_STATUS,

                    Settings.Global.SELINUX_UPDATE_CONTENT_URL,

                    Settings.Global.SELINUX_UPDATE_METADATA_URL,

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

+0 −3
Original line number Diff line number Diff line
@@ -386,9 +386,6 @@ class SettingsProtoDumpUtil { 
        dumpSetting(s, p,

                Settings.Global.PDP_WATCHDOG_MAX_PDP_RESET_FAIL_COUNT,

                GlobalSettingsProto.PDP_WATCHDOG_MAX_PDP_RESET_FAIL_COUNT);

        dumpSetting(s, p,

                Settings.Global.SAMPLING_PROFILER_MS,

                GlobalSettingsProto.SAMPLING_PROFILER_MS);

        dumpSetting(s, p,

                Settings.Global.SETUP_PREPAID_DATA_SERVICE_URL,

                GlobalSettingsProto.SETUP_PREPAID_DATA_SERVICE_URL);