drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Stop checking StorageManager.inCryptKeeperBounce() in DPM

Browse Source 
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
This commit is contained in:
Eric Biggers 2022-03-28 18:55:47 +00:00
parent b8e11a0afd
commit fd38747356
2 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
services/devicepolicy/java/com/android/server/devicepolicy/CertificateMonitor.java
View File

@ -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));
}

5
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
View File

@ -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();