diff options
| author | markchien <markchien@google.com> | 2020-01-31 14:04:36 +0800 |
|---|---|---|
| committer | markchien <markchien@google.com> | 2020-01-31 14:04:36 +0800 |
| commit | 5f7b3be99eaa14318e70f3a4015c75d2e6b7c855 (patch) | |
| tree | 6d99c149dbc5dab454f856590a90f40bc2f70c26 | |
| parent | 497afcff0ca3bfd60de4c5647ad7bb0167e6abb9 (diff) | |
Fix NPE in tethering startup
mUserManager should be ready before #makeTethering because mTethering may
call isTetheringSupported which need to reference mUserManager
Bug: 148642028
Test: build
Change-Id: I100b5d6cc8f49640c33fa930b819033de5d6492c
| -rw-r--r-- | packages/Tethering/src/com/android/server/connectivity/tethering/TetheringService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/Tethering/src/com/android/server/connectivity/tethering/TetheringService.java b/packages/Tethering/src/com/android/server/connectivity/tethering/TetheringService.java index 7dc5c5f2db8a..020b32adcfd7 100644 --- a/packages/Tethering/src/com/android/server/connectivity/tethering/TetheringService.java +++ b/packages/Tethering/src/com/android/server/connectivity/tethering/TetheringService.java @@ -77,8 +77,8 @@ public class TetheringService extends Service { mLog.mark("onCreate"); mDeps = getTetheringDependencies(); mContext = mDeps.getContext(); - mTethering = makeTethering(mDeps); mUserManager = (UserManager) mContext.getSystemService(Context.USER_SERVICE); + mTethering = makeTethering(mDeps); } /** |