Merge "Fix exception in getting capabilities" into udc-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
e8151bf27d
@@ -357,16 +357,6 @@ public final class CredentialProviderInfoFactory {
|
|||||||
Log.e(TAG, "Failed to get capabilities: ", e);
|
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) {
|
if (capabilities.size() == 0) {
|
||||||
Log.e(TAG, "No capabilities found for provider:" + serviceInfo);
|
Log.e(TAG, "No capabilities found for provider:" + serviceInfo);
|
||||||
return output;
|
return output;
|
||||||
|
|||||||
Reference in New Issue
Block a user