| commit | b12280202d6aeb2852c6fa6582cdcb89293b4a65 | [log] [tgz] |
|---|---|---|
| author | Svetoslav <svetoslavganov@google.com> | Mon Jun 01 15:47:32 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 01 15:47:32 2015 +0000 |
| tree | 44e4efed8ef638e523c75d676848d6ee6ffadc87 | |
| parent | df748ed7caf5384a04c7da024e0e9db002d560d1 [diff] | |
| parent | d5464b9d07f6d5cf39d8173d5a026ce457dc458f [diff] |
am d5464b9d: am 80c2cc14: am 815be147: Merge "Use AtomicFile APIs correctly when reading." into mnc-dev * commit 'd5464b9d07f6d5cf39d8173d5a026ce457dc458f': Use AtomicFile APIs correctly when reading.
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java index 9209c26..a2adb15 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java
@@ -400,7 +400,7 @@ return; } try { - in = new FileInputStream(mStatePersistFile); + in = new AtomicFile(mStatePersistFile).openRead(); } catch (FileNotFoundException fnfe) { Slog.i(LOG_TAG, "No settings state"); return;
diff --git a/services/core/java/com/android/server/pm/Settings.java b/services/core/java/com/android/server/pm/Settings.java index d2a135c..8f2db30 100644 --- a/services/core/java/com/android/server/pm/Settings.java +++ b/services/core/java/com/android/server/pm/Settings.java
@@ -4386,7 +4386,7 @@ FileInputStream in; try { - in = new FileInputStream(permissionsFile); + in = new AtomicFile(permissionsFile).openRead(); } catch (FileNotFoundException fnfe) { Slog.i(PackageManagerService.TAG, "No permissions state"); return;