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

Commit 4f283acb authored by Jacky Wang's avatar Jacky Wang Committed by Android (Google) Code Review
Browse files

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
parents 34bd0481 5847d50e

src/com/android/settings/SettingsApplication.java

+5 −1
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import com.android.settings.activityembedding.ActivityEmbeddingUtils; 
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 class SettingsApplication extends Application { 
    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) {

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

+0 −5
Original line number Diff line number Diff line
@@ -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 @@ import com.android.settingslib.datastore.BackupRestoreStorageManager; 


/** 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();

src/com/android/settings/fuelgauge/BatterySettingsStorage.java

+18 −2
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ import android.content.SharedPreferences; 
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 androidx.annotation.Nullable; 


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 @@ public final class BatterySettingsStorage extends ObservableBackupRestoreStorage 
        return Arrays.asList(allowlistedApps);

    }



    @NonNull

    @Override

    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 writeNewStateDescription(@NonNull ParcelFileDescriptor newState) {

    public void onRestoreFinished() {

        BatterySettingsMigrateChecker.verifySaverConfiguration(mApplication);

        performRestoreIfNeeded();

    }

src/com/android/settings/localepicker/LocaleNotificationDataManager.java

+9 −0
Original line number Diff line number Diff line
@@ -19,8 +19,11 @@ package com.android.settings.localepicker; 
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 @@ public class LocaleNotificationDataManager { 
        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);

    }