commit 836df19fd0be1d5951829fdfcb22a61a77d51d6f
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Apr 27 01:40:33 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 27 01:40:33 2023 +0000
tree 25d7d6d8340987959a9b81be0974a93a9e6c9c79
parent 6522287338d6e492e56892e2ff73841262f3db70
parent b8dc150e5afb931293e07ccb3b74d952ff1aebbf

Merge "Fixed ServiceNameBaseResolver" into udc-dev

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);