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

Commit 728dceac authored by Bernardo Rufino's avatar Bernardo Rufino
Browse files

Remove old BackupManagerService 

As discussed, only removed the class, local interface and trampoline
still exist. That will go into a next CL.

Bug: 65823538
Test: make RunFrameworksServicesRoboTests
Test: runtest -p com.android.server.backup frameworks-services
Test: gts-tradefed run commandAndExit gts-dev -m GtsBackupTestCases
Test: gts-tradefed run commandAndExit gts-dev -m GtsBackupHostTestCases
Test: cts-tradefed run commandAndExit cts-dev -m CtsBackupTestCases
Test: adb shell bmgr backupnow <kv and full-backup packages>
Test: adb backup & adb restore
Change-Id: Ifcb4c02e364b8c4899ff376ff20cd8c89fc1af28
parent 514a7403

core/java/android/provider/Settings.java

+0 −8
Original line number Original line Diff line number Diff line
@@ -10429,14 +10429,6 @@ public final class Settings { 
        public static final String LOCATION_SETTINGS_LINK_TO_PERMISSIONS_ENABLED =

        public static final String LOCATION_SETTINGS_LINK_TO_PERMISSIONS_ENABLED =

                "location_settings_link_to_permissions_enabled";

                "location_settings_link_to_permissions_enabled";





        /**

         * Flag to enable use of RefactoredBackupManagerService.

         *

         * @hide

         */

        public static final String BACKUP_REFACTORED_SERVICE_DISABLED =

            "backup_refactored_service_disabled";



        /**

        /**

         * Flag to set the waiting time for euicc factory reset inside System > Settings

         * Flag to set the waiting time for euicc factory reset inside System > Settings

         * Type: long

         * Type: long

core/proto/android/providers/settings.proto

+1 −1
Original line number Original line Diff line number Diff line
@@ -367,7 +367,7 @@ message GlobalSettingsProto { 
    optional SettingProto database_creation_buildid = 330;

    optional SettingProto database_creation_buildid = 330;

    optional SettingProto contacts_database_wal_enabled = 275;

    optional SettingProto contacts_database_wal_enabled = 275;

    optional SettingProto location_settings_link_to_permissions_enabled = 331;

    optional SettingProto location_settings_link_to_permissions_enabled = 331;

    optional SettingProto backup_refactored_service_disabled = 332;

    reserved 332; // Removed backup_refactored_service_disabled

    optional SettingProto euicc_factory_reset_timeout_millis = 333;

    optional SettingProto euicc_factory_reset_timeout_millis = 333;

    optional SettingProto storage_settings_clobber_threshold = 334;

    optional SettingProto storage_settings_clobber_threshold = 334;

    optional SettingProto multi_sim_voice_call_subscription = 276;

    optional SettingProto multi_sim_voice_call_subscription = 276;

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

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

                    Settings.Global.APP_IDLE_CONSTANTS,

                    Settings.Global.ASSISTED_GPS_ENABLED,

                    Settings.Global.ASSISTED_GPS_ENABLED,

                    Settings.Global.AUDIO_SAFE_VOLUME_STATE,

                    Settings.Global.AUDIO_SAFE_VOLUME_STATE,

                    Settings.Global.BACKUP_REFACTORED_SERVICE_DISABLED,

                    Settings.Global.BATTERY_DISCHARGE_DURATION_THRESHOLD,

                    Settings.Global.BATTERY_DISCHARGE_DURATION_THRESHOLD,

                    Settings.Global.BATTERY_DISCHARGE_THRESHOLD,

                    Settings.Global.BATTERY_DISCHARGE_THRESHOLD,

                    Settings.Global.BATTERY_SAVER_DEVICE_SPECIFIC_CONSTANTS,

                    Settings.Global.BATTERY_SAVER_DEVICE_SPECIFIC_CONSTANTS,

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

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

        dumpSetting(s, p,

                Settings.Global.LOCATION_SETTINGS_LINK_TO_PERMISSIONS_ENABLED,

                Settings.Global.LOCATION_SETTINGS_LINK_TO_PERMISSIONS_ENABLED,

                GlobalSettingsProto.LOCATION_SETTINGS_LINK_TO_PERMISSIONS_ENABLED);

                GlobalSettingsProto.LOCATION_SETTINGS_LINK_TO_PERMISSIONS_ENABLED);

        dumpSetting(s, p,

                Settings.Global.BACKUP_REFACTORED_SERVICE_DISABLED,

                GlobalSettingsProto.BACKUP_REFACTORED_SERVICE_DISABLED);

        dumpSetting(s, p,

        dumpSetting(s, p,

                Settings.Global.EUICC_FACTORY_RESET_TIMEOUT_MILLIS,

                Settings.Global.EUICC_FACTORY_RESET_TIMEOUT_MILLIS,

                GlobalSettingsProto.EUICC_FACTORY_RESET_TIMEOUT_MILLIS);

                GlobalSettingsProto.EUICC_FACTORY_RESET_TIMEOUT_MILLIS);

services/backup/java/com/android/server/backup/BackupManagerService.java

deleted100644 → 0
+0 −11494

File deleted.

File size exceeds preview limit.

View file