LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Fix NPE that netd callback call null TetheringConfiguration object"

Browse Source
This commit is contained in:
Mark Chien
2020-02-06 09:03:39 +00:00
committed by Gerrit Code Review
parent ee013e376a 7dda458908
commit a156a16654
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Tethering/src/com/android/server/connectivity/tethering/Tethering.java
View File

@@ -272,13 +272,6 @@ public class Tethering {
mStateReceiver = new StateReceiver(); 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( final UserManager userManager = (UserManager) mContext.getSystemService(
Context.USER_SERVICE); Context.USER_SERVICE);
mTetheringRestriction = new UserRestrictionActionListener(userManager, this); mTetheringRestriction = new UserRestrictionActionListener(userManager, this);
@@ -287,6 +280,14 @@ public class Tethering {
// Load tethering configuration. // Load tethering configuration.
updateConfiguration(); 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); startStateMachineUpdaters(mHandler);
startTrackDefaultNetwork(); startTrackDefaultNetwork();