Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b3739511 authored by Chia-chi Yeh's avatar Chia-chi Yeh Committed by Android (Google) Code Review
Browse files

Merge "Extract NetworkManagementService out from Tethering to ConnectivityService."

parents e845c352 c9338305

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

+5 −1
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ import android.os.Binder; 
import android.os.Handler;

import android.os.HandlerThread;

import android.os.IBinder;

import android.os.INetworkManagementService;

import android.os.Looper;

import android.os.Message;

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) ||

                                  !mTethering.isDunRequired()) &&

                                 (mTethering.getTetherableUsbRegexs().length != 0 ||

services/java/com/android/server/connectivity/Tethering.java

+49 −110

File changed.

Preview size limit exceeded, changes collapsed.