diff options
2 files changed, 9 insertions, 1 deletions
diff --git a/services/credentials/java/com/android/server/credentials/CredentialManagerService.java b/services/credentials/java/com/android/server/credentials/CredentialManagerService.java index 4a2e1cba5cce..686b2a813bd3 100644 --- a/services/credentials/java/com/android/server/credentials/CredentialManagerService.java +++ b/services/credentials/java/com/android/server/credentials/CredentialManagerService.java @@ -65,7 +65,6 @@ import android.util.Slog; import android.util.SparseArray; import com.android.internal.annotations.GuardedBy; -import com.android.internal.content.PackageMonitor; import com.android.server.credentials.metrics.ApiName; import com.android.server.credentials.metrics.ApiStatus; import com.android.server.infra.AbstractMasterSystemService; @@ -1204,6 +1203,9 @@ public final class CredentialManagerService // If the app being removed matches any of the package names from // this list then don't add it in the output. Set<String> providers = new HashSet<>(); + if (rawProviders == null || packageName == null) { + return providers; + } for (String rawComponentName : rawProviders.split(":")) { if (TextUtils.isEmpty(rawComponentName) || rawComponentName.equals("null")) { diff --git a/services/tests/servicestests/src/com/android/server/credentials/CredentialManagerServiceTest.java b/services/tests/servicestests/src/com/android/server/credentials/CredentialManagerServiceTest.java index fd1abff8610b..d850c73ebc26 100644 --- a/services/tests/servicestests/src/com/android/server/credentials/CredentialManagerServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/credentials/CredentialManagerServiceTest.java @@ -53,6 +53,12 @@ public final class CredentialManagerServiceTest { } @Test + public void getStoredProviders_nullValue_success() { + Set<String> providers = CredentialManagerService.getStoredProviders(null, null); + assertThat(providers.size()).isEqualTo(0); + } + + @Test public void getStoredProviders_success() { Set<String> providers = CredentialManagerService.getStoredProviders( |