From 9171989a9c7df1f379cc8ca67e9a4692c3d72db8 Mon Sep 17 00:00:00 2001 From: Sreeram Ramachandran Date: Fri, 5 Sep 2014 16:06:34 -0700 Subject: [PATCH] Reserve NetIds 1..50 for OEM use. Also reserve 51..100 for our use. Bug: 17303534 Change-Id: Id082368b493dc3c5b5c479e51d273458d80ec6aa --- .../core/java/com/android/server/ConnectivityService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index 3bab1bfa33..94124652b9 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -425,8 +425,8 @@ public class ConnectivityService extends IConnectivityManager.Stub { 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;