Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 80c2cc14: am 815be147: Merge "Use AtomicFile APIs correctly when reading." into mnc-dev

Browse Source 
* commit '80c2cc14e12c3f79bb617e12c0827dc0eb7e7374':
  Use AtomicFile APIs correctly when reading.
This commit is contained in:
Svetoslav
2015-06-01 15:27:48 +00:00
committed by Android Git Automerger
parent c623d9887b 80c2cc14e1
commit d5464b9d07
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java
View File

@@ -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;

2
services/core/java/com/android/server/pm/Settings.java
View File

@@ -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;