Merge changes from topic "datastore-file" into main
* changes:
[DataStore] Support backup data state computation
[DataStore] Support backup data with compression
[DataStore] Migrate LocaleNotification SharedPreferences to BackupRestoreStorage
diff --git a/src/com/android/settings/SettingsApplication.java b/src/com/android/settings/SettingsApplication.java
index 1a53b83..c0d2445 100644
--- a/src/com/android/settings/SettingsApplication.java
+++ b/src/com/android/settings/SettingsApplication.java
@@ -30,6 +30,7 @@
import com.android.settings.core.instrumentation.ElapsedTimeUtils;
import com.android.settings.fuelgauge.BatterySettingsStorage;
import com.android.settings.homepage.SettingsHomepageActivity;
+import com.android.settings.localepicker.LocaleNotificationDataManager;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.overlay.FeatureFactoryImpl;
import com.android.settings.spa.SettingsSpaEnvironment;
@@ -56,7 +57,10 @@
public void onCreate() {
super.onCreate();
- BackupRestoreStorageManager.getInstance(this).add(new BatterySettingsStorage(this));
+ BackupRestoreStorageManager.getInstance(this)
+ .add(
+ new BatterySettingsStorage(this),
+ LocaleNotificationDataManager.getSharedPreferencesStorage(this));
// Add null checking to avoid test case failed.
if (getApplicationContext() != null) {
diff --git a/src/com/android/settings/backup/SettingsBackupHelper.java b/src/com/android/settings/backup/SettingsBackupHelper.java
index 0861af2..556ab72 100644
--- a/src/com/android/settings/backup/SettingsBackupHelper.java
+++ b/src/com/android/settings/backup/SettingsBackupHelper.java
@@ -16,10 +16,8 @@
package com.android.settings.backup;
-import static com.android.settings.localepicker.LocaleNotificationDataManager.LOCALE_NOTIFICATION;
import android.app.backup.BackupAgentHelper;
-import android.app.backup.SharedPreferencesBackupHelper;
import com.android.settings.flags.Flags;
import com.android.settings.onboarding.OnboardingFeatureProvider;
@@ -29,15 +27,12 @@
/** Backup agent for Settings APK */
public class SettingsBackupHelper extends BackupAgentHelper {
- private static final String PREF_LOCALE_NOTIFICATION = "localeNotificationSharedPref";
public static final String SOUND_BACKUP_HELPER = "SoundSettingsBackup";
@Override
public void onCreate() {
super.onCreate();
BackupRestoreStorageManager.getInstance(this).addBackupAgentHelpers(this);
- addHelper(PREF_LOCALE_NOTIFICATION,
- new SharedPreferencesBackupHelper(this, LOCALE_NOTIFICATION));
if (Flags.enableSoundBackup()) {
OnboardingFeatureProvider onboardingFeatureProvider =
FeatureFactory.getFeatureFactory().getOnboardingFeatureProvider();
diff --git a/src/com/android/settings/fuelgauge/BatterySettingsStorage.java b/src/com/android/settings/fuelgauge/BatterySettingsStorage.java
index ff3223f..36fa5bb 100644
--- a/src/com/android/settings/fuelgauge/BatterySettingsStorage.java
+++ b/src/com/android/settings/fuelgauge/BatterySettingsStorage.java
@@ -26,7 +26,6 @@
import android.content.pm.ApplicationInfo;
import android.os.Build;
import android.os.IDeviceIdleController;
-import android.os.ParcelFileDescriptor;
import android.os.RemoteException;
import android.os.ServiceManager;
import android.os.UserHandle;
@@ -39,6 +38,7 @@
import com.android.settings.fuelgauge.BatteryOptimizeHistoricalLogEntry.Action;
import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.datastore.BackupCodec;
import com.android.settingslib.datastore.BackupContext;
import com.android.settingslib.datastore.BackupRestoreEntity;
import com.android.settingslib.datastore.BackupRestoreStorageManager;
@@ -159,8 +159,24 @@
return Arrays.asList(allowlistedApps);
}
+ @NonNull
@Override
- public void writeNewStateDescription(@NonNull ParcelFileDescriptor newState) {
+ public OutputStream wrapBackupOutputStream(
+ @NonNull BackupCodec codec, @NonNull OutputStream outputStream) {
+ // not using any codec for backward compatibility
+ return outputStream;
+ }
+
+ @NonNull
+ @Override
+ public InputStream wrapRestoreInputStream(
+ @NonNull BackupCodec codec, @NonNull InputStream inputStream) {
+ // not using any codec for backward compatibility
+ return inputStream;
+ }
+
+ @Override
+ public void onRestoreFinished() {
BatterySettingsMigrateChecker.verifySaverConfiguration(mApplication);
performRestoreIfNeeded();
}
diff --git a/src/com/android/settings/localepicker/LocaleNotificationDataManager.java b/src/com/android/settings/localepicker/LocaleNotificationDataManager.java
index 0e89366..6ec578d 100644
--- a/src/com/android/settings/localepicker/LocaleNotificationDataManager.java
+++ b/src/com/android/settings/localepicker/LocaleNotificationDataManager.java
@@ -19,8 +19,11 @@
import android.content.Context;
import android.content.SharedPreferences;
+import androidx.annotation.NonNull;
import androidx.annotation.VisibleForTesting;
+import com.android.settingslib.datastore.SharedPreferencesStorage;
+
import com.google.gson.Gson;
import java.util.HashMap;
@@ -43,6 +46,12 @@
this.mContext = context;
}
+ /** Returns the underlying {@link SharedPreferences} storage. */
+ @NonNull
+ public static SharedPreferencesStorage getSharedPreferencesStorage(@NonNull Context context) {
+ return new SharedPreferencesStorage(context, LOCALE_NOTIFICATION, Context.MODE_PRIVATE);
+ }
+
private static SharedPreferences getSharedPreferences(Context context) {
return context.getSharedPreferences(LOCALE_NOTIFICATION, Context.MODE_PRIVATE);
}