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 am: feaf412e19

Browse Source 
am: fb91426d12

Change-Id: I06e09bfaeb1040b97afa392faace339eb5bab4ad
This commit is contained in:
Lorenzo Colitti
2018-01-16 05:32:55 +00:00
committed by android-build-merger
parent 2466fd29e6 fb91426d12
commit b25b5d4f81
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

@@ -357,13 +357,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