diff options
| author | Svetoslav <svetoslavganov@google.com> | 2015-05-29 20:51:58 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-05-29 20:51:58 +0000 |
| commit | 80c2cc14e12c3f79bb617e12c0827dc0eb7e7374 (patch) | |
| tree | ad5385936d2d8b8fdf9a7a74df4b4493ddada6a6 | |
| parent | db57c48e1c34d26823bc25e2da00e1056324efb4 (diff) | |
| parent | 815be147a35452d52feb0610ff11d8645351ad9f (diff) | |
| download | frameworks_base-80c2cc14e12c3f79bb617e12c0827dc0eb7e7374.zip frameworks_base-80c2cc14e12c3f79bb617e12c0827dc0eb7e7374.tar.gz frameworks_base-80c2cc14e12c3f79bb617e12c0827dc0eb7e7374.tar.bz2 | |
am 815be147: Merge "Use AtomicFile APIs correctly when reading." into mnc-dev
* commit '815be147a35452d52feb0610ff11d8645351ad9f':
Use AtomicFile APIs correctly when reading.
| -rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java | 2 | ||||
| -rw-r--r-- | services/core/java/com/android/server/pm/Settings.java | 2 |
2 files changed, 2 insertions, 2 deletions
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 @@ final class SettingsState { 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 @@ final class Settings { FileInputStream in; try { - in = new FileInputStream(permissionsFile); + in = new AtomicFile(permissionsFile).openRead(); } catch (FileNotFoundException fnfe) { Slog.i(PackageManagerService.TAG, "No permissions state"); return; |