commit a76aade27ef612368d06fb48d3cf19d040b4f85f
author Jacky Wang <jiannan@google.com> Wed Mar 06 17:57:57 2024 +0800
committer Cherrypicker Worker <android-build-cherrypicker-worker@google.com> Wed Mar 13 03:23:19 2024 +0000
tree da35ddadd2c548cb3d45e7b975cfa651a4b232e2
parent 11c9f1bff490f1eb0185ae3eab75ec4e27cbd858

[DataStore] Support backup data with compression

Bug: 325144964
Test: Manual tests
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:23821a69f31c5712cb369bfdd7776a66926dc5ac)
Merged-In: Id73a30c2b58fafa6d9d1cbe247a6d9c38397394b
Change-Id: Id73a30c2b58fafa6d9d1cbe247a6d9c38397394b

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

diff --git a/src/com/android/settings/fuelgauge/BatterySettingsStorage.java b/src/com/android/settings/fuelgauge/BatterySettingsStorage.java
index ff3223f..ca78cc2 100644
--- a/src/com/android/settings/fuelgauge/BatterySettingsStorage.java
+++ b/src/com/android/settings/fuelgauge/BatterySettingsStorage.java
@@ -39,6 +39,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,6 +160,22 @@
         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) {
         BatterySettingsMigrateChecker.verifySaverConfiguration(mApplication);