From 5f7b3be99eaa14318e70f3a4015c75d2e6b7c855 Mon Sep 17 00:00:00 2001
From: markchien <markchien@google.com>
Date: Fri, 31 Jan 2020 14:04:36 +0800
Subject: [PATCH] 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
---
 .../android/server/connectivity/tethering/TetheringService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 7dc5c5f2db8aa..020b32adcfd73 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);
     }
 
     /**