Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d0e66360 authored by Mark Chien's avatar Mark Chien Committed by android-build-merger
Browse files

Merge "Fix NullPointerException in ConnectivityService" 

am: 56dbf7cc

Change-Id: I2e6cf2d4a665ec8c106f8dc97891454fe2836a1d
parents 39f9c1c2 56dbf7cc

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

+2 −2
Original line number Diff line number Diff line
@@ -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));