Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 86c2a5ec authored by Jeremy Joslin's avatar Jeremy Joslin
Browse files

Cleanup the evaluateBinding() method. 

Small refactor to remove 1 level of nesting.

Test: build, run.
Change-Id: I38836ca9d18c5fcd3c6edf5931b58de3b08614ee
parent 15a30363

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

+29 −27
Original line number Original line Diff line number Diff line
@@ -146,13 +146,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.
@@ -179,7 +182,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.