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

Commit dfa67a39 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix exception in getting capabilities" into udc-dev am: e8151bf2 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22168623



Change-Id: Ibd37ef3ede3064f42199199056e95c6c83e232fd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4a3fe397 e8151bf2

core/java/android/service/credentials/CredentialProviderInfoFactory.java

+0 −10
Original line number Original line Diff line number Diff line
@@ -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;