commit db275b40f2b503198cfbc2743437f04af3868262
author Mark Chien <markchien@google.com> Tue Jun 11 23:43:37 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Jun 11 23:43:37 2019 -0700
tree a552fa7448913c3a26b26b6813189e7f4ea00dea
parent b36f670c2fb9754bb93b7b7e64984092e9decf77
parent d0e6636019e8e3f95810c1ccfed3b10a8859cfaf

Merge "Fix NullPointerException in ConnectivityService" am: 56dbf7cc45
am: d0e6636019

Change-Id: If0c65bd11f5b76e35f6033fa79a8938f7e47a8e7

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 cdb9c03..20782b7 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));