commit b8dc150e5afb931293e07ccb3b74d952ff1aebbf
author Felipe Leme <felipeal@google.com> Mon Apr 24 10:43:42 2023 -0700
committer Felipe Leme <felipeal@google.com> Mon Apr 24 10:44:48 2023 -0700
tree fcf1bf5ff32782f480aa08a1f35f01e30f80599f
parent f64a382e623bf629df192a964124a53225ca383f

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

services/core/java/com/android/server/infra/ServiceNameBaseResolver.java

diff --git a/services/core/java/com/android/server/infra/ServiceNameBaseResolver.java b/services/core/java/com/android/server/infra/ServiceNameBaseResolver.java
index 76ea05e..66ce5c7 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 @@
             }
             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);