Merge "Add API to check if credman is enabled" (92c2d64b) · Commits · e / os / android_frameworks_base

core/api/current.txt

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -13509,6 +13509,7 @@ package android.credentials {
	method public void clearCredentialState(@NonNull android.credentials.ClearCredentialStateRequest, @Nullable android.os.CancellationSignal, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<java.lang.Void,android.credentials.ClearCredentialStateException>);		method public void clearCredentialState(@NonNull android.credentials.ClearCredentialStateRequest, @Nullable android.os.CancellationSignal, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<java.lang.Void,android.credentials.ClearCredentialStateException>);
	method public void createCredential(@NonNull android.credentials.CreateCredentialRequest, @NonNull android.app.Activity, @Nullable android.os.CancellationSignal, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<android.credentials.CreateCredentialResponse,android.credentials.CreateCredentialException>);		method public void createCredential(@NonNull android.credentials.CreateCredentialRequest, @NonNull android.app.Activity, @Nullable android.os.CancellationSignal, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<android.credentials.CreateCredentialResponse,android.credentials.CreateCredentialException>);
	method public void getCredential(@NonNull android.credentials.GetCredentialRequest, @NonNull android.app.Activity, @Nullable android.os.CancellationSignal, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<android.credentials.GetCredentialResponse,android.credentials.GetCredentialException>);		method public void getCredential(@NonNull android.credentials.GetCredentialRequest, @NonNull android.app.Activity, @Nullable android.os.CancellationSignal, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<android.credentials.GetCredentialResponse,android.credentials.GetCredentialException>);
			method public boolean isEnabledCredentialProviderService(@NonNull android.content.ComponentName);
	method public void registerCredentialDescription(@NonNull android.credentials.RegisterCredentialDescriptionRequest);		method public void registerCredentialDescription(@NonNull android.credentials.RegisterCredentialDescriptionRequest);
	method public void unregisterCredentialDescription(@NonNull android.credentials.UnregisterCredentialDescriptionRequest);		method public void unregisterCredentialDescription(@NonNull android.credentials.UnregisterCredentialDescriptionRequest);
	}		}

core/java/android/credentials/CredentialManager.java

+20 −0

Original line number	Original line	Diff line number	Diff line
	@@ -25,6 +25,7 @@ import android.annotation.RequiresPermission;
	import android.annotation.SystemService;		import android.annotation.SystemService;
	import android.app.Activity;		import android.app.Activity;
	import android.app.PendingIntent;		import android.app.PendingIntent;
			import android.content.ComponentName;
	import android.content.Context;		import android.content.Context;
	import android.content.IntentSender;		import android.content.IntentSender;
	import android.os.CancellationSignal;		import android.os.CancellationSignal;
	@@ -279,6 +280,25 @@ public final class CredentialManager {
	}		}
	}		}

			/**
			* Returns {@code true} if the calling application provides a CredentialProviderService that is
			* enabled for the current user, or {@code false} otherwise. CredentialProviderServices are
			* enabled on a per-service basis so the individual component name of the service should be
			* passed in here.
			*
			* @param componentName the component name to check is enabled
			*/
			public boolean isEnabledCredentialProviderService(@NonNull ComponentName componentName) {
			requireNonNull(componentName, "componentName must not be null");

			try {
			return mService.isEnabledCredentialProviderService(
			componentName, mContext.getOpPackageName());
			} catch (RemoteException e) {
			throw e.rethrowFromSystemServer();
			}
			}

	/**		/**
	* Returns whether the service is enabled.		* Returns whether the service is enabled.
	*		*

core/java/android/credentials/ICredentialManager.aidl

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -28,6 +28,7 @@ import android.credentials.ICreateCredentialCallback;
	import android.credentials.IGetCredentialCallback;		import android.credentials.IGetCredentialCallback;
	import android.credentials.IListEnabledProvidersCallback;		import android.credentials.IListEnabledProvidersCallback;
	import android.credentials.ISetEnabledProvidersCallback;		import android.credentials.ISetEnabledProvidersCallback;
			import android.content.ComponentName;
	import android.os.ICancellationSignal;		import android.os.ICancellationSignal;

	/**		/**
	@@ -50,5 +51,7 @@ interface ICredentialManager {
	void registerCredentialDescription(in RegisterCredentialDescriptionRequest request, String callingPackage);		void registerCredentialDescription(in RegisterCredentialDescriptionRequest request, String callingPackage);

	void unregisterCredentialDescription(in UnregisterCredentialDescriptionRequest request, String callingPackage);		void unregisterCredentialDescription(in UnregisterCredentialDescriptionRequest request, String callingPackage);

			boolean isEnabledCredentialProviderService(in ComponentName componentName, String callingPackage);
	}		}

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

+31 −0

Original line number	Original line	Diff line number	Diff line
	@@ -573,6 +573,37 @@ public final class CredentialManagerService
	getContext().sendBroadcast(IntentFactory.createProviderUpdateIntent());		getContext().sendBroadcast(IntentFactory.createProviderUpdateIntent());
	}		}

			@Override
			public boolean isEnabledCredentialProviderService(
			ComponentName componentName, String callingPackage) {
			Log.i(TAG, "isEnabledCredentialProviderService");

			// TODO(253157366): Check additional set of services.
			final int userId = UserHandle.getCallingUserId();
			synchronized (mLock) {
			final List<CredentialManagerServiceImpl> services =
			getServiceListForUserLocked(userId);
			for (CredentialManagerServiceImpl s : services) {
			final ComponentName serviceComponentName = s.getServiceComponentName();

			if (serviceComponentName.equals(componentName)) {
			if (!s.getServicePackageName().equals(callingPackage)) {
			// The component name and the package name do not match.
			Log.w(
			TAG,
			"isEnabledCredentialProviderService: Component name does not"
			+ " match package name.");
			return false;
			}

			return true;
			}
			}
			}

			return false;
			}

	@Override		@Override
	public ICancellationSignal clearCredentialState(		public ICancellationSignal clearCredentialState(
	ClearCredentialStateRequest request,		ClearCredentialStateRequest request,