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

Commit 433631ed authored by Robin Lee's avatar Robin Lee Committed by android-build-merger
Browse files

Merge "Reinstate USER_PRESENT for ConnectivityService" 

am: 2c822945

Change-Id: If8b7239cdabdd79d9ea24baf99e95c6ec1a9acf3
parents 042be0bd 2c822945

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

+12 −0
Original line number Diff line number Diff line
@@ -815,6 +815,8 @@ public class ConnectivityService extends IConnectivityManager.Stub 
        intentFilter.addAction(Intent.ACTION_USER_UNLOCKED);

        mContext.registerReceiverAsUser(

                mUserIntentReceiver, UserHandle.ALL, intentFilter, null, null);

        mContext.registerReceiverAsUser(mUserPresentReceiver, UserHandle.SYSTEM,

                new IntentFilter(Intent.ACTION_USER_PRESENT), null, null);



        try {

            mNetd.registerObserver(mTethering);
@@ -4005,6 +4007,16 @@ public class ConnectivityService extends IConnectivityManager.Stub 
        }

    };



    private BroadcastReceiver mUserPresentReceiver = new BroadcastReceiver() {

        @Override

        public void onReceive(Context context, Intent intent) {

            // Try creating lockdown tracker, since user present usually means

            // unlocked keystore.

            updateLockdownVpn();

            mContext.unregisterReceiver(this);

        }

    };



    private final HashMap<Messenger, NetworkFactoryInfo> mNetworkFactoryInfos =

            new HashMap<Messenger, NetworkFactoryInfo>();

    private final HashMap<NetworkRequest, NetworkRequestInfo> mNetworkRequests =