PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[DataStore] Migrate LocaleNotification SharedPreferences to BackupRestoreStorage

Browse Source 
Bug: 325144964
Test: Manual tests
Change-Id: I195ee91f29030fcfe7176ed0c18fb2e2d0d40257
This commit is contained in:
Jacky Wang
2024-02-29 22:39:33 +08:00
parent 46369353ed
commit cc0a94d732
3 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/SettingsApplication.java
View File

@@ -30,6 +30,7 @@ import com.android.settings.activityembedding.ActivityEmbeddingUtils;
import com.android.settings.core.instrumentation.ElapsedTimeUtils; import com.android.settings.core.instrumentation.ElapsedTimeUtils;
import com.android.settings.fuelgauge.BatterySettingsStorage; import com.android.settings.fuelgauge.BatterySettingsStorage;
import com.android.settings.homepage.SettingsHomepageActivity; import com.android.settings.homepage.SettingsHomepageActivity;
import com.android.settings.localepicker.LocaleNotificationDataManager;
import com.android.settings.overlay.FeatureFactory; import com.android.settings.overlay.FeatureFactory;
import com.android.settings.overlay.FeatureFactoryImpl; import com.android.settings.overlay.FeatureFactoryImpl;
import com.android.settings.spa.SettingsSpaEnvironment; import com.android.settings.spa.SettingsSpaEnvironment;
@@ -56,7 +57,10 @@ public class SettingsApplication extends Application {
public void onCreate() { public void onCreate() {
super.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. // Add null checking to avoid test case failed.
if (getApplicationContext() != null) { if (getApplicationContext() != null) {

5
src/com/android/settings/backup/SettingsBackupHelper.java
View File

@@ -16,10 +16,8 @@
package com.android.settings.backup; package com.android.settings.backup;
import static com.android.settings.localepicker.LocaleNotificationDataManager.LOCALE_NOTIFICATION;
import android.app.backup.BackupAgentHelper; import android.app.backup.BackupAgentHelper;
import android.app.backup.SharedPreferencesBackupHelper;
import com.android.settings.flags.Flags; import com.android.settings.flags.Flags;
import com.android.settings.onboarding.OnboardingFeatureProvider; import com.android.settings.onboarding.OnboardingFeatureProvider;
@@ -29,15 +27,12 @@ import com.android.settingslib.datastore.BackupRestoreStorageManager;
/** Backup agent for Settings APK */ /** Backup agent for Settings APK */
public class SettingsBackupHelper extends BackupAgentHelper { public class SettingsBackupHelper extends BackupAgentHelper {
private static final String PREF_LOCALE_NOTIFICATION = "localeNotificationSharedPref";
public static final String SOUND_BACKUP_HELPER = "SoundSettingsBackup"; public static final String SOUND_BACKUP_HELPER = "SoundSettingsBackup";
@Override @Override
public void onCreate() { public void onCreate() {
super.onCreate(); super.onCreate();
BackupRestoreStorageManager.getInstance(this).addBackupAgentHelpers(this); BackupRestoreStorageManager.getInstance(this).addBackupAgentHelpers(this);
addHelper(PREF_LOCALE_NOTIFICATION,
new SharedPreferencesBackupHelper(this, LOCALE_NOTIFICATION));
if (Flags.enableSoundBackup()) { if (Flags.enableSoundBackup()) {
OnboardingFeatureProvider onboardingFeatureProvider = OnboardingFeatureProvider onboardingFeatureProvider =
FeatureFactory.getFeatureFactory().getOnboardingFeatureProvider(); FeatureFactory.getFeatureFactory().getOnboardingFeatureProvider();

9
src/com/android/settings/localepicker/LocaleNotificationDataManager.java
View File

@@ -19,8 +19,11 @@ package com.android.settings.localepicker;
import android.content.Context; import android.content.Context;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import androidx.annotation.NonNull;
import androidx.annotation.VisibleForTesting; import androidx.annotation.VisibleForTesting;
import com.android.settingslib.datastore.SharedPreferencesStorage;
import com.google.gson.Gson; import com.google.gson.Gson;
import java.util.HashMap; import java.util.HashMap;
@@ -43,6 +46,12 @@ public class LocaleNotificationDataManager {
this.mContext = context; 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) { private static SharedPreferences getSharedPreferences(Context context) {
return context.getSharedPreferences(LOCALE_NOTIFICATION, Context.MODE_PRIVATE); return context.getSharedPreferences(LOCALE_NOTIFICATION, Context.MODE_PRIVATE);
} }