Merge "Cleanup the evaluateBinding() method." am: c26aa87a2b (3ba918c9) · Commits · e / os / android_frameworks_base

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

+29 −27

Original line number	Diff line number	Diff line
		@@ -147,13 +147,16 @@ public class NetworkScoreService extends INetworkScoreService.Stub {
		}

		private void evaluateBinding(String scorerPackageName, boolean forceUnbind) {
		if (mPackagesToWatch.contains(scorerPackageName)) {
		if (!mPackagesToWatch.contains(scorerPackageName)) {
		// Early exit when we don't care about the package that has changed.
		return;
		}

		if (DBG) {
		Log.d(TAG, "Evaluating binding for: " + scorerPackageName
		+ ", forceUnbind=" + forceUnbind);
		}
		final NetworkScorerAppData activeScorer =
		mNetworkScorerAppManager.getActiveScorer();
		final NetworkScorerAppData activeScorer = mNetworkScorerAppManager.getActiveScorer();
		if (activeScorer == null) {
		// Package change has invalidated a scorer, this will also unbind any service
		// connection.
		@@ -180,7 +183,6 @@ public class NetworkScoreService extends INetworkScoreService.Stub {
		}
		}
		}
		}

		/**
		* Reevaluates the service binding when the Settings toggle is changed.