Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d5464b9d authored by Svetoslav's avatar Svetoslav Committed by Android Git Automerger
Browse files

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

* commit '80c2cc14':
  Use AtomicFile APIs correctly when reading.
parents c623d988 80c2cc14

packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -400,7 +400,7 @@ final class SettingsState { 
            return;

            return;

        }

        }

        try {

        try {

            in = new FileInputStream(mStatePersistFile);

            in = new AtomicFile(mStatePersistFile).openRead();

        } catch (FileNotFoundException fnfe) {

        } catch (FileNotFoundException fnfe) {

            Slog.i(LOG_TAG, "No settings state");

            Slog.i(LOG_TAG, "No settings state");

            return;

            return;

services/core/java/com/android/server/pm/Settings.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -4386,7 +4386,7 @@ final class Settings { 




            FileInputStream in;

            FileInputStream in;

            try {

            try {

                in = new FileInputStream(permissionsFile);

                in = new AtomicFile(permissionsFile).openRead();

            } catch (FileNotFoundException fnfe) {

            } catch (FileNotFoundException fnfe) {

                Slog.i(PackageManagerService.TAG, "No permissions state");

                Slog.i(PackageManagerService.TAG, "No permissions state");

                return;

                return;