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

Commit 7490c5cb authored by Martijn Coenen's avatar Martijn Coenen Committed by Android (Google) Code Review
Browse files

Merge "Fix broken build due to missing imports in device owner transfer functionality."

parents 9454d58f 67f2c224

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

+2 −0
Original line number Diff line number Diff line
@@ -154,6 +154,7 @@ import android.provider.ContactsContract.QuickContact; 
import android.provider.ContactsInternal;

import android.provider.Settings;

import android.provider.Settings.Global;

import android.security.Credentials;

import android.security.IKeyChainAliasCallback;

import android.security.IKeyChainService;

import android.security.KeyChain;
@@ -162,6 +163,7 @@ import android.security.keymaster.KeymasterCertificateChain; 
import android.security.keystore.KeyGenParameterSpec;

import android.security.keystore.ParcelableKeyGenParameterSpec;

import android.security.KeyStore;

import android.security.keystore.AttestationUtils;

import android.service.persistentdata.PersistentDataBlockManager;

import android.telephony.TelephonyManager;

import android.text.TextUtils;