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

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

Merge "NetworkAgent: Send primitive integer in explicitlySelected" am: bf668472 am: 50a9fc91 

am: 38ee8409

Change-Id: If8ebb61aa2e11516932977457fde64eca35046b5
parents 0034421d 38ee8409

core/java/android/net/NetworkAgent.java

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

     * {@link #saveAcceptUnvalidated} to respect the user's choice.

     */

     */

    public void explicitlySelected(boolean acceptUnvalidated) {

    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 Original line Diff line number Diff line
@@ -2202,7 +2202,7 @@ public class ConnectivityService extends IConnectivityManager.Stub 
                        loge("ERROR: already-connected network explicitly selected.");

                        loge("ERROR: already-connected network explicitly selected.");

                    }

                    }

                    nai.networkMisc.explicitlySelected = true;

                    nai.networkMisc.explicitlySelected = true;

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

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

                    break;

                    break;

                }

                }

                case NetworkAgent.EVENT_PACKET_KEEPALIVE: {

                case NetworkAgent.EVENT_PACKET_KEEPALIVE: {