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

Commit d471b98b authored by junyulai's avatar junyulai Committed by android-build-merger
Browse files

Merge "Fix LockdownVpnTracker deadlock when resetting legacy Always-On VPN" 

am: c07aed0f

Change-Id: If5b3f6f1d397d3ac35b509a2e634a60933f2df6c
parents 85c0a5a2 c07aed0f

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

+1 −1
Original line number Diff line number Diff line
@@ -4551,7 +4551,7 @@ public class ConnectivityService extends IConnectivityManager.Stub 
                    Slog.w(TAG, "VPN for user " + user + " not ready yet. Skipping lockdown");

                    return false;

                }

                setLockdownTracker(new LockdownVpnTracker(mContext, mNMS, this, vpn, profile));

                setLockdownTracker(new LockdownVpnTracker(mContext, this, mHandler, vpn, profile));

            } else {

                setLockdownTracker(null);

            }

services/core/java/com/android/server/net/LockdownVpnTracker.java

+19 −15
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ package com.android.server.net; 
import static android.Manifest.permission.CONNECTIVITY_INTERNAL;

import static android.provider.Settings.ACTION_VPN_SETTINGS;



import android.annotation.NonNull;

import android.annotation.Nullable;

import android.app.Notification;

import android.app.NotificationManager;

import android.app.PendingIntent;
@@ -32,7 +34,7 @@ import android.net.LinkProperties; 
import android.net.NetworkInfo;

import android.net.NetworkInfo.DetailedState;

import android.net.NetworkInfo.State;

import android.os.INetworkManagementService;

import android.os.Handler;

import android.security.Credentials;

import android.security.KeyStore;

import android.text.TextUtils;
@@ -63,19 +65,18 @@ public class LockdownVpnTracker { 


    private static final String ACTION_LOCKDOWN_RESET = "com.android.server.action.LOCKDOWN_RESET";



    private static final int ROOT_UID = 0;

    @NonNull private final Context mContext;

    @NonNull private final ConnectivityService mConnService;

    @NonNull private final Handler mHandler;

    @NonNull private final Vpn mVpn;

    @NonNull private final VpnProfile mProfile;



    private final Context mContext;

    private final INetworkManagementService mNetService;

    private final ConnectivityService mConnService;

    private final Vpn mVpn;

    private final VpnProfile mProfile;

    @NonNull private final Object mStateLock = new Object();



    private final Object mStateLock = new Object();



    private final PendingIntent mConfigIntent;

    private final PendingIntent mResetIntent;

    @NonNull private final PendingIntent mConfigIntent;

    @NonNull private final PendingIntent mResetIntent;



    @Nullable

    private String mAcceptedEgressIface;



    private int mErrorCount;
@@ -84,11 +85,14 @@ public class LockdownVpnTracker { 
        return KeyStore.getInstance().contains(Credentials.LOCKDOWN_VPN);

    }



    public LockdownVpnTracker(Context context, INetworkManagementService netService,

            ConnectivityService connService, Vpn vpn, VpnProfile profile) {

    public LockdownVpnTracker(@NonNull Context context,

            @NonNull ConnectivityService connService,

            @NonNull Handler handler,

            @NonNull Vpn vpn,

            @NonNull VpnProfile profile) {

        mContext = Preconditions.checkNotNull(context);

        mNetService = Preconditions.checkNotNull(netService);

        mConnService = Preconditions.checkNotNull(connService);

        mHandler = Preconditions.checkNotNull(handler);

        mVpn = Preconditions.checkNotNull(vpn);

        mProfile = Preconditions.checkNotNull(profile);
@@ -198,7 +202,7 @@ public class LockdownVpnTracker { 
        mVpn.setLockdown(true);



        final IntentFilter resetFilter = new IntentFilter(ACTION_LOCKDOWN_RESET);

        mContext.registerReceiver(mResetReceiver, resetFilter, CONNECTIVITY_INTERNAL, null);

        mContext.registerReceiver(mResetReceiver, resetFilter, CONNECTIVITY_INTERNAL, mHandler);



        handleStateChangedLocked();

    }