LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Fix NullPointerException in ConnectivityService" am: fe8af96eba

Browse Source 
am: d0e6636019

Change-Id: If0c65bd11f5b76e35f6033fa79a8938f7e47a8e7
This commit is contained in:
Mark Chien
2019-06-11 23:43:37 -07:00
committed by android-build-merger
parent e16dc7932b fe8af96eba
commit c39e80e64c
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(); mTethering = makeTethering();
mPermissionMonitor = new PermissionMonitor(mContext, mNetd); mPermissionMonitor = new PermissionMonitor(mContext, mNetd);
@@ -1013,8 +1015,6 @@ public class ConnectivityService extends IConnectivityManager.Stub
final DataConnectionStats dataConnectionStats = new DataConnectionStats(mContext); final DataConnectionStats dataConnectionStats = new DataConnectionStats(mContext);
dataConnectionStats.startMonitoring(); dataConnectionStats.startMonitoring();
mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
mKeepaliveTracker = new KeepaliveTracker(mContext, mHandler); mKeepaliveTracker = new KeepaliveTracker(mContext, mHandler);
mNotifier = new NetworkNotificationManager(mContext, mTelephonyManager, mNotifier = new NetworkNotificationManager(mContext, mTelephonyManager,
mContext.getSystemService(NotificationManager.class)); mContext.getSystemService(NotificationManager.class));