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

Commit 1e360dac authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Fix NPE that netd callback call null TetheringConfiguration object" am: 4770588b 

Change-Id: I5f6f86d01cf520759ab1be05867380d770fbf945
parents 6c76e044 4770588b

packages/Tethering/src/com/android/server/connectivity/tethering/Tethering.java

+8 −7
Original line number Diff line number Diff line
@@ -272,13 +272,6 @@ public class Tethering { 


        mStateReceiver = new StateReceiver();



        mNetdCallback = new NetdCallback();

        try {

            mNetd.registerUnsolicitedEventListener(mNetdCallback);

        } catch (RemoteException e) {

            mLog.e("Unable to register netd UnsolicitedEventListener");

        }



        final UserManager userManager = (UserManager) mContext.getSystemService(

                Context.USER_SERVICE);

        mTetheringRestriction = new UserRestrictionActionListener(userManager, this);
@@ -287,6 +280,14 @@ public class Tethering { 


        // Load tethering configuration.

        updateConfiguration();

        // NetdCallback should be registered after updateConfiguration() to ensure

        // TetheringConfiguration is created.

        mNetdCallback = new NetdCallback();

        try {

            mNetd.registerUnsolicitedEventListener(mNetdCallback);

        } catch (RemoteException e) {

            mLog.e("Unable to register netd UnsolicitedEventListener");

        }



        startStateMachineUpdaters(mHandler);

        startTrackDefaultNetwork();