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

Commit bed7695b authored by Roshan Pius's avatar Roshan Pius Committed by android-build-merger
Browse files

Merge "NetworkAgent: Send primitive integer in score" am: 7e83b790 

am: c039ad20

Change-Id: I7f6ac7a5fd6ecae4ac077b7f54fe91879a63fa13
parents a20f0f5d c039ad20

core/java/android/net/NetworkAgent.java

+1 −1
Original line number Diff line number Diff line
@@ -372,7 +372,7 @@ public abstract class NetworkAgent extends Handler { 
        if (score < 0) {

            throw new IllegalArgumentException("Score must be >= 0");

        }

        queueOrSendMessage(EVENT_NETWORK_SCORE_CHANGED, new Integer(score));

        queueOrSendMessage(EVENT_NETWORK_SCORE_CHANGED,  score, 0);

    }



    /**

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

+1 −2
Original line number Diff line number Diff line
@@ -2194,8 +2194,7 @@ public class ConnectivityService extends IConnectivityManager.Stub 
                    break;

                }

                case NetworkAgent.EVENT_NETWORK_SCORE_CHANGED: {

                    Integer score = (Integer) msg.obj;

                    if (score != null) updateNetworkScore(nai, score.intValue());

                    updateNetworkScore(nai, msg.arg1);

                    break;

                }

                case NetworkAgent.EVENT_SET_EXPLICITLY_SELECTED: {