commit 56dbf7cc45a9a22289fae654f4ff435e58c14a59
author Mark Chien <markchien@google.com> Wed Jun 12 06:24:41 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jun 12 06:24:41 2019 +0000
tree 5da3ace7f524da23f804358af43779a5dda46ed2
parent 8af90ce15b314cc88c0a4c3a4c04338f215570af
parent 0f1cd1d9084d6f697038946836258f5cf2fe082a

Merge "Fix NullPointerException in ConnectivityService"

services/core/java/com/android/server/ConnectivityService.java

diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index 55b31f2..f6a972b 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -966,6 +966,8 @@
             }
         }
 
+        mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
+
         mTethering = makeTethering();
 
         mPermissionMonitor = new PermissionMonitor(mContext, mNetd);
@@ -1013,8 +1015,6 @@
         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));