diff --git a/services/core/java/com/android/server/NetworkScoreService.java b/services/core/java/com/android/server/NetworkScoreService.java
index d1d1cb3566d2e..3443918df6aba 100644
--- a/services/core/java/com/android/server/NetworkScoreService.java
+++ b/services/core/java/com/android/server/NetworkScoreService.java
@@ -760,12 +760,11 @@ public class NetworkScoreService extends INetworkScoreService.Stub {
     @Override
     public String getActiveScorerPackage() {
         enforceSystemOrHasScoreNetworks();
-        synchronized (mServiceConnectionLock) {
-            if (mServiceConnection != null) {
-                return mServiceConnection.getPackageName();
-            }
+        NetworkScorerAppData appData = mNetworkScorerAppManager.getActiveScorer();
+        if (appData == null) {
+          return null;
         }
-        return null;
+        return appData.getRecommendationServicePackageName();
     }
 
     /**
@@ -775,13 +774,7 @@ public class NetworkScoreService extends INetworkScoreService.Stub {
     public NetworkScorerAppData getActiveScorer() {
         // Only the system can access this data.
         enforceSystemOnly();
-        synchronized (mServiceConnectionLock) {
-            if (mServiceConnection != null) {
-                return mServiceConnection.getAppData();
-            }
-        }
-
-        return null;
+        return mNetworkScorerAppManager.getActiveScorer();
     }
 
     /**