| commit | c755a813f466aaee5c6cd190088edfc68d98bccc | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Feb 03 03:23:56 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Feb 03 03:23:56 2020 +0000 |
| tree | 99f1b84ed7457c3946bcf02423c46e794a2a0d22 | |
| parent | 6da0f4e07ee012097187615f16f7397d07aa70b4 [diff] | |
| parent | 4b9770b9f55aa88079df9f9f4c1ff9bfc8677f83 [diff] |
Merge "Fix NPE in tethering startup" am: 6bf0c6185d am: 4b9770b9f5 Change-Id: Ia2cc89325e9d7d7d9d99f2bd536998b00b9e2ddf
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 7dc5c5f..020b32a 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 @@ mLog.mark("onCreate"); mDeps = getTetheringDependencies(); mContext = mDeps.getContext(); - mTethering = makeTethering(mDeps); mUserManager = (UserManager) mContext.getSystemService(Context.USER_SERVICE); + mTethering = makeTethering(mDeps); } /**