LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Change the netId to nethandle mapping." am: 35bd74cfd3

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 9c8cc85a3d 35bd74cfd3
commit fb91426d12
1 changed files with 3 additions and 3 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
// 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