Merge "Enforce device policy in credential manager (settings)"
This commit is contained in:
committed by
Android (Google) Code Review
commit
3ce2b2e85b
@@ -35,7 +35,6 @@ import android.os.Bundle;
|
|||||||
import android.os.CancellationSignal;
|
import android.os.CancellationSignal;
|
||||||
import android.os.OutcomeReceiver;
|
import android.os.OutcomeReceiver;
|
||||||
import android.os.UserHandle;
|
import android.os.UserHandle;
|
||||||
import android.service.credentials.CredentialProviderInfo;
|
|
||||||
import android.util.IconDrawableFactory;
|
import android.util.IconDrawableFactory;
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
|
|
||||||
@@ -129,12 +128,10 @@ public class CredentialManagerPreferenceController extends BasePreferenceControl
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
List<ServiceInfo> services = new ArrayList<>();
|
setAvailableServices(
|
||||||
for (CredentialProviderInfo cpi :
|
lifecycleOwner,
|
||||||
CredentialProviderInfo.getAvailableServices(mContext, getUser())) {
|
mCredentialManager.getCredentialProviderServices(
|
||||||
services.add(cpi.getServiceInfo());
|
getUser(), CredentialManager.PROVIDER_FILTER_USER_PROVIDERS_ONLY));
|
||||||
}
|
|
||||||
setAvailableServices(lifecycleOwner, services);
|
|
||||||
|
|
||||||
mCredentialManager.listEnabledProviders(
|
mCredentialManager.listEnabledProviders(
|
||||||
mCancellationSignal,
|
mCancellationSignal,
|
||||||
|
Reference in New Issue
Block a user