Merge "Fix NPE in tethering startup" am: 6bf0c6185d am: 4b9770b9f5

Change-Id: Ia2cc89325e9d7d7d9d99f2bd536998b00b9e2ddf
2020-02-03 03:23:56 +00:00
parent 6da0f4e07e 4b9770b9f5
commit c755a813f4
1 changed files with 1 additions and 1 deletions
--- 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);
    }

    /**