Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Cleanup the evaluateBinding() method." am: c26aa87a2b am: b12af1b18a

Browse Source 
am: 3ba918c9d3

Change-Id: I72485ebbaed2b60b48d1b4694b0db56b9f2178ca
This commit is contained in:
Jeremy Joslin
2016-12-28 20:17:35 +00:00
committed by android-build-merger
parent bec9df8060 3ba918c9d3
commit 7a93f7e661
1 changed files with 30 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/NetworkScoreService.java
View File

@@ -147,13 +147,16 @@ public class NetworkScoreService extends INetworkScoreService.Stub {
} }
private void evaluateBinding(String scorerPackageName, boolean forceUnbind) { 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) { if (DBG) {
Log.d(TAG, "Evaluating binding for: " + scorerPackageName Log.d(TAG, "Evaluating binding for: " + scorerPackageName
+ ", forceUnbind=" + forceUnbind); + ", forceUnbind=" + forceUnbind);
} }
final NetworkScorerAppData activeScorer = final NetworkScorerAppData activeScorer = mNetworkScorerAppManager.getActiveScorer();
mNetworkScorerAppManager.getActiveScorer();
if (activeScorer == null) { if (activeScorer == null) {
// Package change has invalidated a scorer, this will also unbind any service // Package change has invalidated a scorer, this will also unbind any service
// connection. // connection.
@@ -180,7 +183,6 @@ public class NetworkScoreService extends INetworkScoreService.Stub {
} }
} }
} }
}
/** /**
* Reevaluates the service binding when the Settings toggle is changed. * Reevaluates the service binding when the Settings toggle is changed.