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

Commit 91317107 authored by Paul Lawrence's avatar Paul Lawrence
Browse files

Create correct files in dropbox on encrypted boot 

On the minimal framework start, don't mark ro.runtime.firstboot, allowing
the real framework to properly create the dropbox files in the real /data

Bug: 17450632
Change-Id: Ic53b3471b44e69f3eea7e3f3de18e789f51192bc
parent 204dc65f

core/java/com/android/server/BootReceiver.java

+9 −2
Original line number Diff line number Diff line
@@ -123,8 +123,15 @@ public class BootReceiver extends BroadcastReceiver { 
        }



        if (SystemProperties.getLong("ro.runtime.firstboot", 0) == 0) {

            if ("encrypted".equals(SystemProperties.get("ro.crypto.state"))

                && "trigger_restart_min_framework".equals(SystemProperties.get("vold.decrypt"))){

                // Encrypted, first boot to get PIN/pattern/password so data is tmpfs

                // Don't set ro.runtime.firstboot so that we will do this again

                // when data is properly mounted

            } else {

                String now = Long.toString(System.currentTimeMillis());

                SystemProperties.set("ro.runtime.firstboot", now);

            }

            if (db != null) db.addText("SYSTEM_BOOT", headers);



            // Negative sizes mean to take the *tail* of the file (see FileUtils.readTextFile())