From 9ac67d0f9c14dfbbc26b7b4ee32b7db7d88bfb52 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Mon, 28 Mar 2022 18:57:17 +0000 Subject: [PATCH] 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 --- .../core/java/com/android/server/BootReceiver.java | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/services/core/java/com/android/server/BootReceiver.java b/services/core/java/com/android/server/BootReceiver.java index 26d76a848a020..aac1035059eca 100644 --- a/services/core/java/com/android/server/BootReceiver.java +++ b/services/core/java/com/android/server/BootReceiver.java @@ -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 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); - } + 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())