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

Commit 78faa2ae authored by Reema Bajwa's avatar Reema Bajwa Committed by Automerger Merge Worker
Browse files

Merge "Address TODOs for Credential Manager" into udc-dev am: bf9648a7 

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



Change-Id: Id6a67bc0aa07764b7ae1a5d9e409b68953bd7929
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cb4cf7fe bf9648a7

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

+17 −6
Original line number Diff line number Diff line
@@ -196,25 +196,36 @@ public final class CredentialManagerService 
            return;

        }



        CredentialManagerServiceImpl serviceToBeRemoved = null;

        List<CredentialManagerServiceImpl> servicesToBeRemoved = new ArrayList<>();

        for (CredentialManagerServiceImpl service : services) {

            if (service != null) {

                CredentialProviderInfo credentialProviderInfo = service.getCredentialProviderInfo();

                ComponentName componentName =

                        credentialProviderInfo.getServiceInfo().getComponentName();

                if (packageName.equals(componentName.getPackageName())) {

                    serviceToBeRemoved = service;

                    removeServiceFromMultiModeSettings(componentName.flattenToString(), userId);

                    break;

                    servicesToBeRemoved.add(service);

                }

            }

        }

        if (serviceToBeRemoved != null) {



        // Iterate over all the services to be removed, and remove them from the user configurable

        // services cache, the system services cache as well as the setting key-value pair.

        for (CredentialManagerServiceImpl serviceToBeRemoved : servicesToBeRemoved) {

            removeServiceFromCache(serviceToBeRemoved, userId);

            removeServiceFromSystemServicesCache(serviceToBeRemoved, userId);

            removeServiceFromMultiModeSettings(serviceToBeRemoved.getComponentName()

                    .flattenToString(), userId);

            CredentialDescriptionRegistry.forUser(userId)

                    .evictProviderWithPackageName(serviceToBeRemoved.getServicePackageName());

        }

        // TODO("Iterate over system services and remove if needed")

    }



    @GuardedBy("mLock")

    private void removeServiceFromSystemServicesCache(

            CredentialManagerServiceImpl serviceToBeRemoved, int userId) {

        if (mSystemServicesCacheList.get(userId) != null) {

            mSystemServicesCacheList.get(userId).remove(serviceToBeRemoved);

        }

    }



    @GuardedBy("mLock")

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

+0 −2
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ public final class CredentialManagerServiceImpl extends 
        AbstractPerUserSystemService<CredentialManagerServiceImpl, CredentialManagerService> {

    private static final String TAG = "CredManSysServiceImpl";



    // TODO(b/210531) : Make final when update flow is fixed

    @GuardedBy("mLock")

    @NonNull

    private CredentialProviderInfo mInfo;
@@ -72,7 +71,6 @@ public final class CredentialManagerServiceImpl extends 
    @GuardedBy("mLock")

    protected ServiceInfo newServiceInfoLocked(@NonNull ComponentName serviceComponent)

            throws PackageManager.NameNotFoundException {

        // TODO : Test update flows with multiple providers

        if (mInfo != null) {

            Slog.i(TAG, "newServiceInfoLocked, mInfo not null : "

                    + mInfo.getServiceInfo().getComponentName().flattenToString() + " , "

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

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ public class CredentialManagerUi { 
    private final CredentialManagerUiCallback mCallbacks;

    @NonNull

    private final Context mContext;

    // TODO : Use for starting the activity for this user



    private final int mUserId;



    private UiStatus mStatus;

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

+1 −2
Original line number Diff line number Diff line
@@ -62,7 +62,6 @@ public final class ProviderClearSession extends ProviderSession<ClearCredentialS 
            android.credentials.ClearCredentialStateRequest clientRequest,

            CallingAppInfo callingAppInfo

    ) {

        // TODO: Determine if provider needs to declare clear capability in manifest

        return new ClearCredentialStateRequest(

                callingAppInfo,

                clientRequest.getData());
@@ -95,7 +94,7 @@ public final class ProviderClearSession extends ProviderSession<ClearCredentialS 
            mProviderSessionMetric.collectCandidateFrameworkException(mProviderException.getType());

        }

        mProviderSessionMetric.collectCandidateExceptionStatus(/*hasException=*/true);

        updateStatusAndInvokeCallback(toStatus(errorCode),

        updateStatusAndInvokeCallback(Status.CANCELED,

                /*source=*/ CredentialsSource.REMOTE_PROVIDER);

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ public final class ProviderCreateSession extends ProviderSession< 
            mProviderSessionMetric.collectCandidateFrameworkException(mProviderException.getType());

        }

        mProviderSessionMetric.collectCandidateExceptionStatus(/*hasException=*/true);

        updateStatusAndInvokeCallback(toStatus(errorCode),

        updateStatusAndInvokeCallback(Status.CANCELED,

                /*source=*/ CredentialsSource.REMOTE_PROVIDER);

    }