diff --git a/services/core/java/com/android/server/infra/AbstractMasterSystemService.java b/services/core/java/com/android/server/infra/AbstractMasterSystemService.java
index 4c265f4cf021b..29e5f922b468a 100644
--- a/services/core/java/com/android/server/infra/AbstractMasterSystemService.java
+++ b/services/core/java/com/android/server/infra/AbstractMasterSystemService.java
@@ -828,7 +828,7 @@ public abstract class AbstractMasterSystemService<M extends AbstractMasterSystem
         for (int i = 0; i < size; i++) {
             List<S> services = mServicesCacheList.valueAt(i);
             for (int j = 0; j < services.size(); j++) {
-                visitor.visit(services.get(i));
+                visitor.visit(services.get(j));
             }
         }
     }