diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index 55b31f2ca5..f6a972b090 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -966,6 +966,8 @@ public class ConnectivityService extends IConnectivityManager.Stub } } + mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE); + mTethering = makeTethering(); mPermissionMonitor = new PermissionMonitor(mContext, mNetd); @@ -1013,8 +1015,6 @@ public class ConnectivityService extends IConnectivityManager.Stub final DataConnectionStats dataConnectionStats = new DataConnectionStats(mContext); dataConnectionStats.startMonitoring(); - mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE); - mKeepaliveTracker = new KeepaliveTracker(mContext, mHandler); mNotifier = new NetworkNotificationManager(mContext, mTelephonyManager, mContext.getSystemService(NotificationManager.class));