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

Commit 9ac67d0f authored by Eric Biggers's avatar Eric Biggers
Browse files

Stop checking StorageManager.inCryptKeeperBounce() in BootReceiver 

FDE (Full Disk Encryption) is no longer supported, so
StorageManager.inCryptKeeperBounce() is now hard-coded to return false.
In preparation for removing this method, stop calling it from
BootReceiver.

Bug: 208476087
Change-Id: Iccf509553fe01074634b14d670262a984a2fe400
parent fd387473

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

+2 −9
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ import android.os.RecoverySystem; 
import android.os.RemoteException;

import android.os.ServiceManager;

import android.os.SystemProperties;

import android.os.storage.StorageManager;

import android.provider.Downloads;

import android.system.ErrnoException;

import android.system.Os;
@@ -281,14 +280,8 @@ public class BootReceiver extends BroadcastReceiver { 
        HashMap<String, Long> timestamps = readTimestamps();



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

            if (StorageManager.inCryptKeeperBounce()) {

                // 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())