Merge "Fix NetworkScoreService#getActiveScorer." into rvc-dev (ea920f59) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/NetworkScoreService.java

+5 −12

Original line number	Diff line number	Diff line
		@@ -760,13 +760,12 @@ 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 appData.getRecommendationServicePackageName();
		}

		/**
		* Returns metadata about the active scorer or <code>null</code> if there is no active scorer.
		@@ -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();
		}

		/**