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

Commit 93e0bad4 authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by android-build-merger
Browse files

Merge "Change the netId to nethandle mapping." am: 9456c020 

am: feaf412e

Change-Id: Idd1b2f462c1c78bdb68b43a4aa77bf2358f7cb52
parents d50943d0 feaf412e

core/java/android/net/Network.java

+3 −3
Original line number Diff line number Diff line
@@ -356,13 +356,13 @@ public class Network implements Parcelable { 
        // Multiple Provisioning Domains API recommendations, as made by the

        // IETF mif working group.

        //

        // The HANDLE_MAGIC value MUST be kept in sync with the corresponding

        // The handleMagic value MUST be kept in sync with the corresponding

        // value in the native/android/net.c NDK implementation.

        if (netId == 0) {

            return 0L;  // make this zero condition obvious for debugging

        }

        final long HANDLE_MAGIC = 0xfacade;

        return (((long) netId) << 32) | HANDLE_MAGIC;

        final long handleMagic = 0xcafed00dL;

        return (((long) netId) << 32) | handleMagic;

    }



    // implement the Parcelable interface

native/android/net.c

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ static int getnetidfromhandle(net_handle_t handle, unsigned *netid) { 
    static const uint32_t k32BitMask = 0xffffffff;

    // This value MUST be kept in sync with the corresponding value in

    // the android.net.Network#getNetworkHandle() implementation.

    static const uint32_t kHandleMagic = 0xfacade;

    static const uint32_t kHandleMagic = 0xcafed00d;



    // Check for minimum acceptable version of the API in the low bits.

    if (handle != NETWORK_UNSPECIFIED &&