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

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

Merge "Do not register the callbacks in the constructor."

parents 0e9e03f5 008ff39b

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

+6 −0
Original line number Diff line number Diff line
@@ -458,6 +458,12 @@ public class ConnectivityService extends IConnectivityManager.Stub { 
                                  mTethering.getTetherableBluetoothRegexs().length != 0) &&

                                 mTethering.getUpstreamIfaceRegexs().length != 0);



        try {

            nmService.registerObserver(mTethering);

        } catch (RemoteException e) {

            loge("Error registering observer :" + e);

        }



        if (DBG) {

            mInetLog = new ArrayList();

        }

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

+0 −7
Original line number Diff line number Diff line
@@ -129,13 +129,6 @@ public class Tethering extends INetworkManagementEventObserver.Stub { 
        mNMService = nmService;

        mLooper = looper;



        // register for notifications from NetworkManagement Service

        try {

            mNMService.registerObserver(this);

        } catch (RemoteException e) {

            Log.e(TAG, "Error registering observer :" + e);

        }



        mIfaces = new HashMap<String, TetherInterfaceSM>();



        // make our own thread so we don't anr the system