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

Commit 7dfb20b2 authored by Yan Yan's avatar Yan Yan Committed by Automerger Merge Worker
Browse files

Merge "Check the existence of IpSecTransformState API with try catch" into main am: 45645485 

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



Change-Id: Idb60f5002b8771c778b53ff277c4b1b9c78fa1cc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5bb1e04b 45645485

services/core/java/com/android/server/vcn/VcnContext.java

+11 −3
Original line number Original line Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.server.vcn; 




import android.annotation.NonNull;

import android.annotation.NonNull;

import android.content.Context;

import android.content.Context;

import android.net.IpSecTransformState;

import android.net.vcn.FeatureFlags;

import android.net.vcn.FeatureFlags;

import android.net.vcn.FeatureFlagsImpl;

import android.net.vcn.FeatureFlagsImpl;

import android.os.Looper;

import android.os.Looper;
@@ -34,7 +35,6 @@ public class VcnContext { 
    @NonNull private final Looper mLooper;

    @NonNull private final Looper mLooper;

    @NonNull private final VcnNetworkProvider mVcnNetworkProvider;

    @NonNull private final VcnNetworkProvider mVcnNetworkProvider;

    @NonNull private final FeatureFlags mFeatureFlags;

    @NonNull private final FeatureFlags mFeatureFlags;

    @NonNull private final android.net.platform.flags.FeatureFlags mCoreNetFeatureFlags;

    private final boolean mIsInTestMode;

    private final boolean mIsInTestMode;





    public VcnContext(

    public VcnContext(
@@ -49,7 +49,6 @@ public class VcnContext { 




        // Auto-generated class

        // Auto-generated class

        mFeatureFlags = new FeatureFlagsImpl();

        mFeatureFlags = new FeatureFlagsImpl();

        mCoreNetFeatureFlags = new android.net.platform.flags.FeatureFlagsImpl();

    }

    }





    @NonNull

    @NonNull
@@ -76,7 +75,16 @@ public class VcnContext { 
    }

    }





    public boolean isFlagIpSecTransformStateEnabled() {

    public boolean isFlagIpSecTransformStateEnabled() {

        return mCoreNetFeatureFlags.ipsecTransformState();

        // TODO: b/328844044: Ideally this code should gate the behavior by checking the

        // android.net.platform.flags.ipsec_transform_state flag but that flag is not accessible

        // right now. We should either update the code when the flag is accessible or remove the

        // legacy behavior after VIC SDK finalization

        try {

            new IpSecTransformState.Builder();

            return true;

        } catch (Exception e) {

            return false;

        }

    }

    }





    @NonNull

    @NonNull

tests/vcn/java/com/android/server/vcn/routeselection/NetworkEvaluationTestBase.java

+0 −1
Original line number Original line Diff line number Diff line
@@ -107,7 +107,6 @@ public abstract class NetworkEvaluationTestBase { 
    @Mock protected Context mContext;

    @Mock protected Context mContext;

    @Mock protected Network mNetwork;

    @Mock protected Network mNetwork;

    @Mock protected FeatureFlags mFeatureFlags;

    @Mock protected FeatureFlags mFeatureFlags;

    @Mock protected android.net.platform.flags.FeatureFlags mCoreNetFeatureFlags;

    @Mock protected TelephonySubscriptionSnapshot mSubscriptionSnapshot;

    @Mock protected TelephonySubscriptionSnapshot mSubscriptionSnapshot;

    @Mock protected ConnectivityManager mConnectivityManager;

    @Mock protected ConnectivityManager mConnectivityManager;

    @Mock protected TelephonyManager mTelephonyManager;

    @Mock protected TelephonyManager mTelephonyManager;