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

Commit 77689d19 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Merge "Add log for debugging flaky test" am: 5a9aacd1 am: 452bdba4... 

Merge "Merge "Add log for debugging flaky test" am: 5a9aacd1 am: 452bdba4 am: 389f04df am: 55543118" into tm-qpr-dev-plus-aosp am: 867fc581

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2194344



Change-Id: I4330659c21e43251027362696c17d5d389ae9c01
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 90f7ad36 867fc581

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

+11 −1
Original line number Diff line number Diff line
@@ -756,6 +756,8 @@ public class Vpn { 
            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) {

        // Add log for debugging flaky test. b/242833779

        Log.d(TAG, "buildVpnManagerEventIntent: sessionKey = " + sessionKey);

        final Intent intent = new Intent(VpnManager.ACTION_VPN_MANAGER_EVENT);

        intent.setPackage(packageName);

        intent.addCategory(category);
@@ -2756,6 +2758,8 @@ public class Vpn { 
            mIpSecManager = (IpSecManager) mContext.getSystemService(Context.IPSEC_SERVICE);

            mNetworkCallback = new VpnIkev2Utils.Ikev2VpnNetworkCallback(TAG, this, mExecutor);

            mSessionKey = UUID.randomUUID().toString();

            // Add log for debugging flaky test. b/242833779

            Log.d(TAG, "Generate session key = " + mSessionKey);



            // Set the policy so that cancelled tasks will be removed from the work queue

            mExecutor.setRemoveOnCancelPolicy(true);
@@ -3948,7 +3952,13 @@ public class Vpn { 
    @GuardedBy("this")

    @Nullable

    private String getSessionKeyLocked() {

        return isIkev2VpnRunner() ? ((IkeV2VpnRunner) mVpnRunner).mSessionKey : null;

        // Add log for debugging flaky test. b/242833779

        final boolean isIkev2VpnRunner = isIkev2VpnRunner();

        final String sessionKey =

                isIkev2VpnRunner ? ((IkeV2VpnRunner) mVpnRunner).mSessionKey : null;

        Log.d(TAG, "getSessionKeyLocked: isIkev2VpnRunner = " + isIkev2VpnRunner

                + ", sessionKey = " + sessionKey);

        return sessionKey;

    }



    /**