Merge "Remove deprected capability API" (0596d6c8) · Commits · e / os / android_frameworks_base

core/api/current.txt

+0 −1

Original line number	Diff line number	Diff line
		@@ -40737,7 +40737,6 @@ package android.service.credentials {
		method public abstract void onBeginGetCredential(@NonNull android.service.credentials.BeginGetCredentialRequest, @NonNull android.os.CancellationSignal, @NonNull android.os.OutcomeReceiver<android.service.credentials.BeginGetCredentialResponse,android.credentials.GetCredentialException>);
		method @NonNull public final android.os.IBinder onBind(@NonNull android.content.Intent);
		method public abstract void onClearCredentialState(@NonNull android.service.credentials.ClearCredentialStateRequest, @NonNull android.os.CancellationSignal, @NonNull android.os.OutcomeReceiver<java.lang.Void,android.credentials.ClearCredentialStateException>);
		field @Deprecated public static final String CAPABILITY_META_DATA_KEY = "android.credentials.capabilities";
		field public static final String EXTRA_BEGIN_GET_CREDENTIAL_REQUEST = "android.service.credentials.extra.BEGIN_GET_CREDENTIAL_REQUEST";
		field public static final String EXTRA_BEGIN_GET_CREDENTIAL_RESPONSE = "android.service.credentials.extra.BEGIN_GET_CREDENTIAL_RESPONSE";
		field public static final String EXTRA_CREATE_CREDENTIAL_EXCEPTION = "android.service.credentials.extra.CREATE_CREDENTIAL_EXCEPTION";

+0 −40

Original line number	Diff line number	Diff line
		@@ -225,14 +225,6 @@ public final class CredentialProviderInfoFactory {
		Log.e(TAG, "Failed to get XML metadata", e);
		}

		// 5. Extract the legacy metadata.
		try {
		builder.addCapabilities(
		populateLegacyProviderCapabilities(resources, metadata, serviceInfo));
		} catch (Exception e) {
		Log.e(TAG, "Failed to get legacy metadata ", e);
		}

		return builder;
		}

		@@ -327,38 +319,6 @@ public final class CredentialProviderInfoFactory {
		return capabilities;
		}

		private static List<String> populateLegacyProviderCapabilities(
		Resources resources, Bundle metadata, ServiceInfo serviceInfo) {
		List<String> output = new ArrayList<>();
		List<String> capabilities = new ArrayList<>();

		try {
		String[] discovered =
		resources.getStringArray(
		metadata.getInt(CredentialProviderService.CAPABILITY_META_DATA_KEY));
		if (discovered != null) {
		capabilities.addAll(Arrays.asList(discovered));
		}
		} catch (Resources.NotFoundException \| NullPointerException e) {
		Log.e(TAG, "Failed to get capabilities: ", e);
		}

		if (capabilities.size() == 0) {
		Log.e(TAG, "No capabilities found for provider:" + serviceInfo);
		return output;
		}

		for (String capability : capabilities) {
		if (capability == null \|\| capability.isEmpty()) {
		Log.w(TAG, "Skipping empty/null capability");
		continue;
		}
		Log.i(TAG, "Capabilities found for provider: " + capability);
		output.add(capability);
		}
		return output;
		}

		private static ServiceInfo getServiceInfoOrThrow(
		@NonNull ComponentName serviceComponent, int userId)
		throws PackageManager.NameNotFoundException {

+0 −8

Original line number	Diff line number	Diff line
		@@ -156,14 +156,6 @@ public abstract class CredentialProviderService extends Service {

		private static final String TAG = "CredProviderService";

		/**
		* The list of capabilities exposed by a credential provider.
		*
		* @deprecated Replaced with {@link android.service.credentials#SERVICE_META_DATA}
		*/
		@Deprecated
		public static final String CAPABILITY_META_DATA_KEY = "android.credentials.capabilities";

		/**
		* Name under which a Credential Provider service component publishes information
		* about itself. This meta-data must reference an XML resource containing