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

Commit 0a23bda2 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Do a null check before returning the primary providers" into udc-dev am: cc87e369 

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



Change-Id: Idb31405ba367e323815c83a07bb4c37c8f7b90fa
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1e06be0b cc87e369

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

+3 −0
Original line number Diff line number Diff line
@@ -290,6 +290,9 @@ public final class CredentialManagerService 
                mContext, Settings.Secure.CREDENTIAL_SERVICE_PRIMARY,

                /* isMultipleMode= */ true);

        String[] serviceNames = resolver.readServiceNameList(resolvedUserId);

        if (serviceNames == null) {

            return new HashSet<String>();

        }

        return new HashSet<String>(Arrays.asList(serviceNames));

    }