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

Commit 159ee22b authored by James Willcox's avatar James Willcox Committed by Android (Google) Code Review
Browse files

Merge changes from topic "credman-tests" 

* changes:
  Add CredentialManagerTest
  Add some null checks in various credentials classes
parents a780d62a 413449d7

core/java/android/credentials/CredentialManager.java

+1 −0
Original line number Diff line number Diff line
@@ -332,6 +332,7 @@ public final class CredentialManager { 
            @Nullable CancellationSignal cancellationSignal,

            @CallbackExecutor @NonNull Executor executor,

            @NonNull OutcomeReceiver<Void, ClearCredentialStateException> callback) {

        requireNonNull(request, "request must not be null");

        requireNonNull(executor, "executor must not be null");

        requireNonNull(callback, "callback must not be null");

core/java/android/service/credentials/CredentialEntry.java

+1 −0
Original line number Diff line number Diff line
@@ -107,6 +107,7 @@ public class CredentialEntry implements Parcelable { 
    }



    private CredentialEntry(@NonNull Parcel in) {

        requireNonNull(in, "parcel must not be null");

        mType = in.readString8();

        mSlice = in.readTypedObject(Slice.CREATOR);

        mBeginGetCredentialOption = in.readTypedObject(BeginGetCredentialOption.CREATOR);

core/java/android/service/credentials/CredentialProviderInfo.java

+7 −3
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package android.service.credentials;



import static java.util.Objects.requireNonNull;



import android.Manifest;

import android.annotation.NonNull;

import android.annotation.Nullable;
@@ -112,10 +114,9 @@ public final class CredentialProviderInfo { 
                        "Provider is not a valid system provider: " + serviceInfo);

            }

        }



        mIsSystemProvider = isSystemProvider;

        mContext = context;

        mServiceInfo = serviceInfo;

        mContext =  requireNonNull(context, "context must not be null");

        mServiceInfo = requireNonNull(serviceInfo, "serviceInfo must not be null");

        mCapabilities = new ArrayList<>();

        mIcon = mServiceInfo.loadIcon(mContext.getPackageManager());

        mLabel =
@@ -300,6 +301,7 @@ public final class CredentialProviderInfo { 
            @NonNull Context context,

            @UserIdInt int userId,

            boolean disableSystemAppVerificationForTests) {

        requireNonNull(context, "context must not be null");

        final List<CredentialProviderInfo> providerInfos = new ArrayList<>();

        for (ServiceInfo si :

                getAvailableSystemServiceInfos(
@@ -381,6 +383,8 @@ public final class CredentialProviderInfo { 
            int userId,

            boolean disableSystemAppVerificationForTests,

            int providerFilter) {

        requireNonNull(context, "context must not be null");



        // Get the device policy.

        PackagePolicy pp = getDeviceManagerPolicy(context);

core/java/android/service/credentials/GetCredentialRequest.java

+6 −2
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ import android.os.Parcelable; 


import com.android.internal.util.AnnotationValidations;



import java.util.Objects;



/**

 * Request for getting user's credential from a given credential provider.

 *
@@ -43,8 +45,10 @@ public final class GetCredentialRequest implements Parcelable { 


    public GetCredentialRequest(@NonNull CallingAppInfo callingAppInfo,

            @NonNull CredentialOption credentialOption) {

        this.mCallingAppInfo = callingAppInfo;

        this.mCredentialOption = credentialOption;

        this.mCallingAppInfo = Objects.requireNonNull(callingAppInfo,

                "callingAppInfo must not be null");

        this.mCredentialOption = Objects.requireNonNull(credentialOption,

                "credentialOption must not be null");

    }



    private GetCredentialRequest(@NonNull Parcel in) {

core/tests/coretests/src/android/credentials/CredentialManagerTest.java

0 → 100644
+626 −0

File added.

Preview size limit exceeded, changes collapsed.