Extract NetworkManagementService out from Tethering to ConnectivityService.

and also some minor refactoring.

Change-Id: I0e74f30ef1b035d9ed37571c512fedc15d05db77
This commit is contained in:
Chia-chi Yeh
2011-05-11 16:35:13 -07:00
parent b5c62b6230
commit 4df51328bd

View File

@@ -41,6 +41,7 @@ import android.os.Binder;
import android.os.Handler; import android.os.Handler;
import android.os.HandlerThread; import android.os.HandlerThread;
import android.os.IBinder; import android.os.IBinder;
import android.os.INetworkManagementService;
import android.os.Looper; import android.os.Looper;
import android.os.Message; import android.os.Message;
import android.os.PowerManager; import android.os.PowerManager;
@@ -425,7 +426,10 @@ public class ConnectivityService extends IConnectivityManager.Stub {
} }
} }
mTethering = new Tethering(mContext, mHandler.getLooper()); IBinder b = ServiceManager.getService(Context.NETWORKMANAGEMENT_SERVICE);
INetworkManagementService nmService = INetworkManagementService.Stub.asInterface(b);
mTethering = new Tethering(mContext, nmService, mHandler.getLooper());
mTetheringConfigValid = (((mNetTrackers[ConnectivityManager.TYPE_MOBILE_DUN] != null) || mTetheringConfigValid = (((mNetTrackers[ConnectivityManager.TYPE_MOBILE_DUN] != null) ||
!mTethering.isDunRequired()) && !mTethering.isDunRequired()) &&
(mTethering.getTetherableUsbRegexs().length != 0 || (mTethering.getTetherableUsbRegexs().length != 0 ||