summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSvetoslav <svetoslavganov@google.com>2015-05-29 13:00:32 -0700
committerSvetoslav <svetoslavganov@google.com>2015-05-29 13:01:37 -0700
commit3dcdd37b66bb996ae332c29e25788a118a9e2691 (patch)
tree6ba90090931e45d13e2b36a3785292decfe89be0
parenta04c7d400c7b9d39b56cec3d705eea39a767370e (diff)
downloadframeworks_base-3dcdd37b66bb996ae332c29e25788a118a9e2691.zip
frameworks_base-3dcdd37b66bb996ae332c29e25788a118a9e2691.tar.gz
frameworks_base-3dcdd37b66bb996ae332c29e25788a118a9e2691.tar.bz2
Use AtomicFile APIs correctly when reading.
21280155 Change-Id: I354ebac8fc91d8f28eec6016474a9521ff2a490d
-rw-r--r--packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java2
-rw-r--r--services/core/java/com/android/server/pm/Settings.java2
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;