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

Commit 0e411890 authored by chiachangwang's avatar chiachangwang Committed by lucaslin
Browse files

Invert the order of event sending and VpnRunner.exit() 

Invert the order to prevent confusing VPN disconnected
notification being sent before the runner actually exits.

Bug: 235322391
Test: atest FrameworksNetTests
Change-Id: Ie83c5ee35509f6ba10465fd9867c596a956e189a
Merged-In: Ie83c5ee35509f6ba10465fd9867c596a956e189a
parent 492e2392

services/core/java/com/android/server/connectivity/Vpn.java

+44 −10
Original line number Diff line number Diff line
@@ -747,7 +747,7 @@ public class Vpn { 
        return true;

    }



    private boolean sendEventToVpnManagerApp(@NonNull String category, int errorClass,

    private Intent buildVpnManagerEventIntent(@NonNull String category, int errorClass,

            int errorCode, @NonNull final String packageName, @Nullable final String sessionKey,

            @NonNull final VpnProfileState profileState, @Nullable final Network underlyingNetwork,

            @Nullable final NetworkCapabilities nc, @Nullable final LinkProperties lp) {
@@ -766,6 +766,20 @@ public class Vpn { 
            intent.putExtra(VpnManager.EXTRA_ERROR_CODE, errorCode);

        }



        return intent;

    }



    private boolean sendEventToVpnManagerApp(@NonNull String category, int errorClass,

            int errorCode, @NonNull final String packageName, @Nullable final String sessionKey,

            @NonNull final VpnProfileState profileState, @Nullable final Network underlyingNetwork,

            @Nullable final NetworkCapabilities nc, @Nullable final LinkProperties lp) {

        final Intent intent = buildVpnManagerEventIntent(category, errorClass, errorCode,

                packageName, sessionKey, profileState, underlyingNetwork, nc, lp);

        return sendEventToVpnManagerApp(intent, packageName);

    }



    private boolean sendEventToVpnManagerApp(@NonNull final Intent intent,

            @NonNull final String packageName) {

        // Allow VpnManager app to temporarily run background services to handle this error.

        // If an app requires anything beyond this grace period, they MUST either declare

        // themselves as a foreground service, or schedule a job/workitem.
@@ -1177,12 +1191,25 @@ public class Vpn { 
                mContext.unbindService(mConnection);

                cleanupVpnStateLocked();

            } else if (mVpnRunner != null) {

                if (!VpnConfig.LEGACY_VPN.equals(mPackage)) {

                    notifyVpnManagerVpnStopped(mPackage, mOwnerUID);

                // Build intent first because the sessionKey will be reset after performing

                // VpnRunner.exit(). Also, cache mOwnerUID even if ownerUID will not be changed in

                // VpnRunner.exit() to prevent design being changed in the future.

                // TODO(b/230548427): Remove SDK check once VPN related stuff are decoupled from

                //  ConnectivityServiceTest.

                final int ownerUid = mOwnerUID;

                Intent intent = null;

                if (SdkLevel.isAtLeastT() && isVpnApp(mPackage)) {

                    intent = buildVpnManagerEventIntent(

                            VpnManager.CATEGORY_EVENT_DEACTIVATED_BY_USER,

                            -1 /* errorClass */, -1 /* errorCode*/, mPackage,

                            getSessionKeyLocked(), makeVpnProfileStateLocked(),

                            null /* underlyingNetwork */, null /* nc */, null /* lp */);

                }



                // cleanupVpnStateLocked() is called from mVpnRunner.exit()

                mVpnRunner.exit();

                if (intent != null && isVpnApp(mPackage)) {

                    notifyVpnManagerVpnStopped(mPackage, ownerUid, intent);

                }

            }



            try {
@@ -4079,13 +4106,23 @@ public class Vpn { 
        // To stop the VPN profile, the caller must be the current prepared package and must be

        // running an Ikev2VpnProfile.

        if (isCurrentIkev2VpnLocked(packageName)) {

            notifyVpnManagerVpnStopped(packageName, mOwnerUID);

            // Build intent first because the sessionKey will be reset after performing

            // VpnRunner.exit(). Also, cache mOwnerUID even if ownerUID will not be changed in

            // VpnRunner.exit() to prevent design being changed in the future.

            final int ownerUid = mOwnerUID;

            final Intent intent = buildVpnManagerEventIntent(

                    VpnManager.CATEGORY_EVENT_DEACTIVATED_BY_USER,

                    -1 /* errorClass */, -1 /* errorCode*/, packageName,

                    getSessionKeyLocked(), makeVpnProfileStateLocked(),

                    null /* underlyingNetwork */, null /* nc */, null /* lp */);



            mVpnRunner.exit();

            notifyVpnManagerVpnStopped(packageName, ownerUid, intent);

        }

    }



    private synchronized void notifyVpnManagerVpnStopped(String packageName, int ownerUID) {

    private synchronized void notifyVpnManagerVpnStopped(String packageName, int ownerUID,

            Intent intent) {

        mAppOpsManager.finishOp(

                AppOpsManager.OPSTR_ESTABLISH_VPN_MANAGER, ownerUID, packageName, null);

        // The underlying network, NetworkCapabilities and LinkProperties are not
@@ -4094,10 +4131,7 @@ public class Vpn { 
        // TODO(b/230548427): Remove SDK check once VPN related stuff are decoupled from

        //  ConnectivityServiceTest.

        if (SdkLevel.isAtLeastT()) {

            sendEventToVpnManagerApp(VpnManager.CATEGORY_EVENT_DEACTIVATED_BY_USER,

                    -1 /* errorClass */, -1 /* errorCode*/, packageName,

                    getSessionKeyLocked(), makeVpnProfileStateLocked(),

                    null /* underlyingNetwork */, null /* nc */, null /* lp */);

            sendEventToVpnManagerApp(intent, packageName);

        }

    }