commit e7df34e01d012ace848f4d557a030f5bc9e5157c
author Sreeram Ramachandran <sreeram@google.com> Mon Sep 08 23:28:47 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Sep 08 23:28:48 2014 +0000
tree 1caef601a748c66e774dec90c4b0134878dc8b1c
parent f615926494dbc6d8d0c96e3915401adf50fbd6c0
parent 8f4d42ce00609e95ef1e842953c6d05fc60e991d

Merge "Reserve NetIds 1..50 for OEM use." into lmp-dev

services/core/java/com/android/server/ConnectivityService.java

diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index 3bab1bf..9412465 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -425,8 +425,8 @@
 
     TelephonyManager mTelephonyManager;
 
-    // sequence number for Networks
-    private final static int MIN_NET_ID = 10; // some reserved marks
+    // sequence number for Networks; keep in sync with system/netd/NetworkController.cpp
+    private final static int MIN_NET_ID = 100; // some reserved marks
     private final static int MAX_NET_ID = 65535;
     private int mNextNetId = MIN_NET_ID;