commit 006bf17c4fa45efc6e58628c71bc42f8c698e11d
author Jacky Wang <jiannan@google.com> Thu Feb 29 11:10:53 2024 +0800
committer Jacky Wang <jiannan@google.com> Sun Mar 03 22:42:00 2024 +0800
tree 95846549dedda4a13d3a2a7b9525eb60a3b4406b
parent bec4c9573ef92c583e235f57e9f220e68572e39d

[DataStore] Migrate BatteryBackupHelper to BackupRestoreStorage

Bug: 325144964
Test: Manual tests
Change-Id: I19f7c78969d70648d1e45f1627827d98b1fdd1e0

src/com/android/settings/backup/SettingsBackupHelper.java

diff --git a/src/com/android/settings/backup/SettingsBackupHelper.java b/src/com/android/settings/backup/SettingsBackupHelper.java
index ecf4c71..0861af2 100644
--- a/src/com/android/settings/backup/SettingsBackupHelper.java
+++ b/src/com/android/settings/backup/SettingsBackupHelper.java
@@ -22,10 +22,10 @@
 import android.app.backup.SharedPreferencesBackupHelper;
 
 import com.android.settings.flags.Flags;
-import com.android.settings.fuelgauge.BatteryBackupHelper;
 import com.android.settings.onboarding.OnboardingFeatureProvider;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.shortcut.CreateShortcutPreferenceController;
+import com.android.settingslib.datastore.BackupRestoreStorageManager;
 
 /** Backup agent for Settings APK */
 public class SettingsBackupHelper extends BackupAgentHelper {
@@ -35,7 +35,7 @@
     @Override
     public void onCreate() {
         super.onCreate();
-        addHelper(BatteryBackupHelper.TAG, new BatteryBackupHelper(this));
+        BackupRestoreStorageManager.getInstance(this).addBackupAgentHelpers(this);
         addHelper(PREF_LOCALE_NOTIFICATION,
                 new SharedPreferencesBackupHelper(this, LOCALE_NOTIFICATION));
         if (Flags.enableSoundBackup()) {
@@ -51,6 +51,7 @@
     @Override
     public void onRestoreFinished() {
         super.onRestoreFinished();
+        BackupRestoreStorageManager.getInstance(this).onRestoreFinished();
         CreateShortcutPreferenceController.updateRestoredShortcuts(this);
     }
 }