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

Commit eaf8dee3 authored by Roshan Pius's avatar Roshan Pius
Browse files

NetworkAgent: Send primitive integer in explicitlySelected 

|Boolean| object is not parcelable and hences crashes when the binder call
crosses a process boundary. Using a primitive integer instead to
represent the boolean value.

Bug: 112358948
Test: Device boots up and able to make wifi connection.
Change-Id: Iac69fd302e1f1338ed0da1446105ffc5855451cc
parent 64e99ef2

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
@@ -2105,7 +2105,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: {