Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: I5f6f86d01cf520759ab1be05867380d770fbf945
This commit is contained in:
Automerger Merge Worker
2020-02-06 09:05:51 +00:00
parent 6c76e04450 4770588bc5
commit 1e360dac26
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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();