Merge "Ensure integrity of sim-settings backupfile with AtomicFile." into sc-dev am: 7f98e18768
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/TelephonyProvider/+/14456865
Change-Id: I76639a6daf1f05552a4cea6f2bf9232537c5640c
diff --git a/src/com/android/providers/telephony/TelephonyProvider.java b/src/com/android/providers/telephony/TelephonyProvider.java
index 31c2cfd..ac6ec2e 100644
--- a/src/com/android/providers/telephony/TelephonyProvider.java
+++ b/src/com/android/providers/telephony/TelephonyProvider.java
@@ -111,6 +111,7 @@
import android.text.TextUtils;
import android.util.ArrayMap;
import android.util.ArraySet;
+import android.util.AtomicFile;
import android.util.Log;
import android.util.Pair;
import android.util.Xml;
@@ -3194,10 +3195,17 @@
@VisibleForTesting
boolean writeSimSettingsToInternalStorage(byte[] data) {
- File file = new File(getContext().getFilesDir(), BACKED_UP_SIM_SPECIFIC_SETTINGS_FILE);
- try (FileOutputStream fos = new FileOutputStream(file)) {
+ AtomicFile atomicFile = new AtomicFile(
+ new File(getContext().getFilesDir(), BACKED_UP_SIM_SPECIFIC_SETTINGS_FILE));
+ FileOutputStream fos = null;
+ try {
+ fos = atomicFile.startWrite();
fos.write(data);
+ atomicFile.finishWrite(fos);
} catch (IOException e) {
+ if (fos != null) {
+ atomicFile.failWrite(fos);
+ }
loge("Not able to create internal file with per-sim configs. Failed with error "
+ e);
return false;
@@ -3224,8 +3232,9 @@
return;
}
+ AtomicFile atomicFile = new AtomicFile(file);
PersistableBundle bundle = null;
- try (FileInputStream fis = new FileInputStream(file)) {
+ try (FileInputStream fis = atomicFile.openRead()) {
bundle = PersistableBundle.readFromStream(fis);
} catch (IOException e) {
loge("Failed to convert backed up per-sim configs to bundle. Stopping restore. "