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

Commit 36fa1f6e authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "NetworkAgent: Send primitive integer in explicitlySelected" am:... 

Merge "Merge "NetworkAgent: Send primitive integer in explicitlySelected" am: bf668472 am: 50a9fc91 am: 38ee8409"
parents 9aa180de e127ca42

core/java/android/net/NetworkAgent.java

+1 −1
Original line number Diff line number Diff line
@@ -387,7 +387,7 @@ public abstract class NetworkAgent extends Handler { 
     * {@link #saveAcceptUnvalidated} to respect the user's choice.

     */

    public void explicitlySelected(boolean acceptUnvalidated) {

        queueOrSendMessage(EVENT_SET_EXPLICITLY_SELECTED, acceptUnvalidated);

        queueOrSendMessage(EVENT_SET_EXPLICITLY_SELECTED, acceptUnvalidated ? 1 : 0, 0);

    }



    /**

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

+1 −1
Original line number Diff line number Diff line
@@ -2202,7 +2202,7 @@ public class ConnectivityService extends IConnectivityManager.Stub 
                        loge("ERROR: already-connected network explicitly selected.");

                    }

                    nai.networkMisc.explicitlySelected = true;

                    nai.networkMisc.acceptUnvalidated = (boolean) msg.obj;

                    nai.networkMisc.acceptUnvalidated = msg.arg1 == 1;

                    break;

                }

                case NetworkAgent.EVENT_PACKET_KEEPALIVE: {