From fd38747356120c6e4a117e56bb0101e0c953ec83 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Mon, 28 Mar 2022 18:55:47 +0000 Subject: [PATCH] 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 cc385c700e84..623e4114f806 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 738e0b46d105..1748f5b3d3ea 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();