From fd38747356120c6e4a117e56bb0101e0c953ec83 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Mon, 28 Mar 2022 18:55:47 +0000 Subject: [PATCH 1/2] Stop checking StorageManager.inCryptKeeperBounce() in DPM 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 the device policy manager. Bug: 208476087 Change-Id: I17ab54dd622aaf749e8c2df925b71f042f440ef8 --- .../com/android/server/devicepolicy/CertificateMonitor.java | 4 ---- .../server/devicepolicy/DevicePolicyManagerService.java | 5 ----- 2 files changed, 9 deletions(-) diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/CertificateMonitor.java b/services/devicepolicy/java/com/android/server/devicepolicy/CertificateMonitor.java index cc385c700e846..623e4114f806b 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/CertificateMonitor.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/CertificateMonitor.java @@ -30,7 +30,6 @@ import android.content.res.Resources; import android.os.Handler; import android.os.RemoteException; import android.os.UserHandle; -import android.os.storage.StorageManager; import android.provider.Settings; import android.security.Credentials; import android.security.KeyChain; @@ -129,9 +128,6 @@ public class CertificateMonitor { private final BroadcastReceiver mRootCaReceiver = new BroadcastReceiver() { @Override public void onReceive(Context context, Intent intent) { - if (StorageManager.inCryptKeeperBounce()) { - return; - } final int userId = intent.getIntExtra(Intent.EXTRA_USER_HANDLE, getSendingUserId()); updateInstalledCertificates(UserHandle.of(userId)); } diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index 738e0b46d105a..1748f5b3d3eab 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -2295,11 +2295,6 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { } private void setDeviceOwnershipSystemPropertyLocked() { - // Still at the first stage of CryptKeeper double bounce, nothing can be learnt about - // the real system at this point. - if (StorageManager.inCryptKeeperBounce()) { - return; - } final boolean deviceProvisioned = mInjector.settingsGlobalGetInt(Settings.Global.DEVICE_PROVISIONED, 0) != 0; final boolean hasDeviceOwner = mOwners.hasDeviceOwner(); From 9ac67d0f9c14dfbbc26b7b4ee32b7db7d88bfb52 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Mon, 28 Mar 2022 18:57:17 +0000 Subject: [PATCH 2/2] 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())