Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: feaf412e19

Change-Id: Idd1b2f462c1c78bdb68b43a4aa77bf2358f7cb52
This commit is contained in:
Lorenzo Colitti
2018-01-16 05:16:34 +00:00
committed by android-build-merger
parent d50943d086 feaf412e19
commit 93e0bad422
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/net/Network.java
View File

@@ -356,13 +356,13 @@ public class Network implements Parcelable {
// Multiple Provisioning Domains API recommendations, as made by the // Multiple Provisioning Domains API recommendations, as made by the
// IETF mif working group. // 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. // value in the native/android/net.c NDK implementation.
if (netId == 0) { if (netId == 0) {
return 0L; // make this zero condition obvious for debugging return 0L; // make this zero condition obvious for debugging
} }
final long HANDLE_MAGIC = 0xfacade; final long handleMagic = 0xcafed00dL;
return (((long) netId) << 32) | HANDLE_MAGIC; return (((long) netId) << 32) | handleMagic;
} }
// implement the Parcelable interface // implement the Parcelable interface

2
native/android/net.c
View File

@@ -27,7 +27,7 @@ static int getnetidfromhandle(net_handle_t handle, unsigned *netid) {
static const uint32_t k32BitMask = 0xffffffff; static const uint32_t k32BitMask = 0xffffffff;
// This value MUST be kept in sync with the corresponding value in // This value MUST be kept in sync with the corresponding value in
// the android.net.Network#getNetworkHandle() implementation. // 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. // Check for minimum acceptable version of the API in the low bits.
if (handle != NETWORK_UNSPECIFIED && if (handle != NETWORK_UNSPECIFIED &&