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

Commit fd387473 authored by Eric Biggers's avatar Eric Biggers
Browse files

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
parent b8e11a0a

services/devicepolicy/java/com/android/server/devicepolicy/CertificateMonitor.java

+0 −4
Original line number Diff line number Diff line
@@ -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));

        }

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+0 −5
Original line number Diff line number Diff line
@@ -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();