Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix NullPointerException in ConnectivityService"

Browse Source 
am: 56dbf7cc45

Change-Id: I2e6cf2d4a665ec8c106f8dc97891454fe2836a1d
This commit is contained in:
Mark Chien
2019-06-11 23:38:29 -07:00
committed by android-build-merger
parent 39f9c1c212 56dbf7cc45
commit d0e6636019
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -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));