Merge "Fix exception in getting capabilities" into udc-dev am: e8151bf27d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22168623 Change-Id: Ibd37ef3ede3064f42199199056e95c6c83e232fd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -357,16 +357,6 @@ public final class CredentialProviderInfoFactory {
|
||||
Log.e(TAG, "Failed to get capabilities: ", e);
|
||||
}
|
||||
|
||||
try {
|
||||
String[] discovered =
|
||||
metadata.getStringArray(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;
|
||||
|
||||
Reference in New Issue
Block a user