commit 674a25d84e71720be58414c73b39d85abff4ada5
author markchien <markchien@google.com> Fri Jan 31 14:04:36 2020 +0800
committer markchien <markchien@google.com> Fri Jan 31 14:04:36 2020 +0800
tree ace534d9cd98fef0c945ac285d662bb033f2ee07
parent 283abc0ad4b1131143c4c25d4dcf63c31b6ed765

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

Tethering/src/com/android/server/connectivity/tethering/TetheringService.java

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);
     }
 
     /**