| commit | 1ad54557384c3a5731ee1482e4becd2e76153c6b | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Feb 03 03:33:27 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Feb 03 03:33:27 2020 +0000 |
| tree | 000e51873d56ef57e0ff032951ae73b218145d59 | |
| parent | 06cea03b79eb1baff236ec916db3446da85ee2d1 [diff] | |
| parent | ee013e376a07ce43c3c00b2c65d76f82aa397e02 [diff] |
Merge "Fix NPE in tethering startup" am: ee013e376a am: 4b9770b9f5 am: c755a813f4 Change-Id: I6d0796f470d2f52350db96f0b6e5b0c7caeddb3d
diff --git a/Tethering/src/com/android/server/connectivity/tethering/TetheringService.java b/Tethering/src/com/android/server/connectivity/tethering/TetheringService.java index 7dc5c5f..020b32a 100644 --- a/Tethering/src/com/android/server/connectivity/tethering/TetheringService.java +++ b/Tethering/src/com/android/server/connectivity/tethering/TetheringService.java
@@ -77,8 +77,8 @@ mLog.mark("onCreate"); mDeps = getTetheringDependencies(); mContext = mDeps.getContext(); - mTethering = makeTethering(mDeps); mUserManager = (UserManager) mContext.getSystemService(Context.USER_SERVICE); + mTethering = makeTethering(mDeps); } /**