commit ce809b902277d89c60e8f427599b7d245247b06e
author Paul Crowley <paulcrowley@google.com> Wed Aug 28 13:35:54 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Aug 28 13:35:54 2019 -0700
tree 5e782537780f0d6131c36dc5aae2ccec381c564d
parent 4beffb1cc9d252424fb35a5118a1784c9bcae3af
parent eac355e574f7afa5ba1d5c3cb6b4519083912c41

Merge "Move layout_version to /data/misc/installd"
am: 24f955155a

Change-Id: Icf3e304aff7e4e1e556c6372be932e3c357d1bbe

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index c9a6479..ea8ae67 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -532,6 +532,7 @@
     mkdir /data/misc/profiles/ref 0771 system system
     mkdir /data/misc/profman 0770 system shell
     mkdir /data/misc/gcov 0770 root root
+    mkdir /data/misc/installd 0700 root root
 
     mkdir /data/preloads 0775 system system
 

sdcard/sdcard.cpp

diff --git a/sdcard/sdcard.cpp b/sdcard/sdcard.cpp
index 2b35819..622de5b 100644
--- a/sdcard/sdcard.cpp
+++ b/sdcard/sdcard.cpp
@@ -315,7 +315,8 @@
         PLOG(ERROR) << "setting RLIMIT_NOFILE failed";
     }
 
-    while ((fs_read_atomic_int("/data/.layout_version", &fs_version) == -1) || (fs_version < 3)) {
+    while ((fs_read_atomic_int("/data/misc/installd/layout_version", &fs_version) == -1) ||
+           (fs_version < 3)) {
         LOG(ERROR) << "installd fs upgrade not yet complete; waiting...";
         sleep(1);
     }