From 3dcdd37b66bb996ae332c29e25788a118a9e2691 Mon Sep 17 00:00:00 2001
From: Svetoslav <svetoslavganov@google.com>
Date: Fri, 29 May 2015 13:00:32 -0700
Subject: [PATCH] Use AtomicFile APIs correctly when reading.

21280155

Change-Id: I354ebac8fc91d8f28eec6016474a9521ff2a490d
---
 .../src/com/android/providers/settings/SettingsState.java       | 2 +-
 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 9209c26ab6a9f..a2adb15862fec 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 d2a135c9787b9..8f2db306c70f3 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;