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

Commit 8ea4f3c7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Wire up isSystemProviderRequest for the create flow" into udc-dev am:... 

Merge "Wire up isSystemProviderRequest for the create flow" into udc-dev am: c43ed523 am: ab88b2b7 am: 56c29201

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22916422



Change-Id: I553fa8fb14a4d3692ea274d420bd37a394f786df
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ab5473af 56c29201

services/credentials/java/com/android/server/credentials/ProviderCreateSession.java

+11 −3
Original line number Diff line number Diff line
@@ -75,7 +75,8 @@ public final class ProviderCreateSession extends ProviderSession< 
        CreateCredentialRequest providerCreateRequest =

                createProviderRequest(providerInfo.getCapabilities(),

                        createRequestSession.mClientRequest,

                        createRequestSession.mClientAppInfo);

                        createRequestSession.mClientAppInfo,

                        providerInfo.isSystemProvider());

        if (providerCreateRequest != null) {

            return new ProviderCreateSession(

                    context,
@@ -114,9 +115,16 @@ public final class ProviderCreateSession extends ProviderSession< 
    }



    @Nullable

    private static CreateCredentialRequest createProviderRequest(List<String> providerCapabilities,

    private static CreateCredentialRequest createProviderRequest(

            List<String> providerCapabilities,

            android.credentials.CreateCredentialRequest clientRequest,

            CallingAppInfo callingAppInfo) {

            CallingAppInfo callingAppInfo,

            boolean isSystemProvider) {

        if (clientRequest.isSystemProviderRequired() && !isSystemProvider) {

            // Request requires system provider but this session does not correspond to a

            // system service

            return null;

        }

        String capability = clientRequest.getType();

        if (providerCapabilities.contains(capability)) {

            return new CreateCredentialRequest(callingAppInfo, capability,