From b8dc150e5afb931293e07ccb3b74d952ff1aebbf Mon Sep 17 00:00:00 2001
From: Felipe Leme <felipeal@google.com>
Date: Mon, 24 Apr 2023 10:43:42 -0700
Subject: [PATCH] Fixed ServiceNameBaseResolver

It was using the wron API to remove a key from the map.

Fixes: 279444189

Test: adb shell cmd content_suggestions set default-service-enabled 42 true && adb shell cmd content_suggestions set default-service-enabled 42 false

Change-Id: I92b91c08a4f47829697f9425129572ed3eeadf89
---
 .../java/com/android/server/infra/ServiceNameBaseResolver.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/infra/ServiceNameBaseResolver.java b/services/core/java/com/android/server/infra/ServiceNameBaseResolver.java
index 76ea05e361415..66ce5c79663e8 100644
--- a/services/core/java/com/android/server/infra/ServiceNameBaseResolver.java
+++ b/services/core/java/com/android/server/infra/ServiceNameBaseResolver.java
@@ -268,7 +268,7 @@ public abstract class ServiceNameBaseResolver implements ServiceNameResolver {
             }
             if (enabled) {
                 Slog.i(TAG, "disabling default service for user " + userId);
-                mDefaultServicesDisabled.removeAt(userId);
+                mDefaultServicesDisabled.delete(userId);
             } else {
                 Slog.i(TAG, "enabling default service for user " + userId);
                 mDefaultServicesDisabled.put(userId, true);