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

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

Merge "Move VCN utilities from services.jar to framework.jar" into main am:... 

Merge "Move VCN utilities from services.jar to framework.jar" into main am: 6cf18f06 am: 2086a497

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



Change-Id: Idb385e1d12265efd5bf7d7047b1d4e148d13575e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5081ba92 2086a497

Android.bp

+1 −3
Original line number Diff line number Diff line
@@ -83,7 +83,6 @@ filegroup { 
        ":framework-telecomm-sources",

        ":framework-telephony-common-sources",

        ":framework-telephony-sources",

        ":framework-vcn-util-sources",

        ":framework-wifi-annotations",

        ":framework-wifi-non-updatable-sources",

        ":PacProcessor-aidl-sources",
@@ -313,7 +312,6 @@ java_defaults { 
            ":framework-telecomm-sources",

            ":framework-telephony-common-sources",

            ":framework-telephony-sources",

            ":framework-vcn-util-sources",

            ":framework-wifi-annotations",

            ":framework-wifi-non-updatable-sources",

            ":PacProcessor-aidl-sources",
@@ -597,7 +595,7 @@ filegroup { 
    srcs: [

        "core/java/com/android/internal/util/HexDump.java",

        "core/java/com/android/internal/util/WakeupMessage.java",

        "services/core/java/com/android/server/vcn/util/PersistableBundleUtils.java",

        "core/java/android/net/vcn/util/PersistableBundleUtils.java",

        "telephony/java/android/telephony/Annotation.java",

    ],

}

core/java/android/net/vcn/VcnCellUnderlyingNetworkTemplate.java

+5 −5
Original line number Diff line number Diff line
@@ -23,18 +23,19 @@ import static android.net.NetworkCapabilities.NET_CAPABILITY_MMS; 
import static android.net.NetworkCapabilities.NET_CAPABILITY_RCS;

import static android.net.vcn.VcnUnderlyingNetworkTemplate.MATCH_ANY;

import static android.net.vcn.VcnUnderlyingNetworkTemplate.getMatchCriteriaString;

import static android.net.vcn.util.PersistableBundleUtils.INTEGER_DESERIALIZER;

import static android.net.vcn.util.PersistableBundleUtils.INTEGER_SERIALIZER;

import static android.net.vcn.util.PersistableBundleUtils.STRING_DESERIALIZER;

import static android.net.vcn.util.PersistableBundleUtils.STRING_SERIALIZER;



import static com.android.internal.annotations.VisibleForTesting.Visibility;

import static com.android.server.vcn.util.PersistableBundleUtils.INTEGER_DESERIALIZER;

import static com.android.server.vcn.util.PersistableBundleUtils.INTEGER_SERIALIZER;

import static com.android.server.vcn.util.PersistableBundleUtils.STRING_DESERIALIZER;

import static com.android.server.vcn.util.PersistableBundleUtils.STRING_SERIALIZER;



import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.SuppressLint;

import android.net.NetworkCapabilities;

import android.net.vcn.VcnUnderlyingNetworkTemplate.MatchCriteria;

import android.net.vcn.util.PersistableBundleUtils;

import android.os.PersistableBundle;

import android.telephony.SubscriptionInfo;

import android.telephony.SubscriptionManager;
@@ -44,7 +45,6 @@ import android.util.IndentingPrintWriter; 


import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.util.Preconditions;

import com.android.server.vcn.util.PersistableBundleUtils;



import java.util.ArrayList;

import java.util.Collections;

core/java/android/net/vcn/VcnConfig.java

+3 −3
Original line number Diff line number Diff line
@@ -18,10 +18,10 @@ package android.net.vcn; 
import static android.net.NetworkCapabilities.TRANSPORT_CELLULAR;

import static android.net.NetworkCapabilities.TRANSPORT_TEST;

import static android.net.NetworkCapabilities.TRANSPORT_WIFI;

import static android.net.vcn.util.PersistableBundleUtils.INTEGER_DESERIALIZER;

import static android.net.vcn.util.PersistableBundleUtils.INTEGER_SERIALIZER;



import static com.android.internal.annotations.VisibleForTesting.Visibility;

import static com.android.server.vcn.util.PersistableBundleUtils.INTEGER_DESERIALIZER;

import static com.android.server.vcn.util.PersistableBundleUtils.INTEGER_SERIALIZER;



import android.annotation.IntDef;

import android.annotation.NonNull;
@@ -29,6 +29,7 @@ import android.annotation.Nullable; 
import android.content.Context;

import android.net.NetworkCapabilities;

import android.net.NetworkRequest;

import android.net.vcn.util.PersistableBundleUtils;

import android.os.Parcel;

import android.os.Parcelable;

import android.os.PersistableBundle;
@@ -37,7 +38,6 @@ import android.util.Log; 


import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.util.Preconditions;

import com.android.server.vcn.util.PersistableBundleUtils;



import java.lang.annotation.ElementType;

import java.lang.annotation.Retention;

core/java/android/net/vcn/VcnGatewayConnectionConfig.java

+1 −1
Original line number Diff line number Diff line
@@ -32,12 +32,12 @@ import android.net.Network; 
import android.net.NetworkCapabilities;

import android.net.ipsec.ike.IkeTunnelConnectionParams;

import android.net.vcn.persistablebundleutils.TunnelConnectionParamsUtils;

import android.net.vcn.util.PersistableBundleUtils;

import android.os.PersistableBundle;

import android.util.ArraySet;



import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.util.Preconditions;

import com.android.server.vcn.util.PersistableBundleUtils;



import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

core/java/android/net/vcn/VcnWifiUnderlyingNetworkTemplate.java

+3 −3
Original line number Diff line number Diff line
@@ -17,22 +17,22 @@ package android.net.vcn; 


import static android.net.NetworkCapabilities.NET_CAPABILITY_INTERNET;

import static android.net.vcn.VcnUnderlyingNetworkTemplate.MATCH_ANY;

import static android.net.vcn.util.PersistableBundleUtils.STRING_DESERIALIZER;

import static android.net.vcn.util.PersistableBundleUtils.STRING_SERIALIZER;



import static com.android.internal.annotations.VisibleForTesting.Visibility;

import static com.android.server.vcn.util.PersistableBundleUtils.STRING_DESERIALIZER;

import static com.android.server.vcn.util.PersistableBundleUtils.STRING_SERIALIZER;



import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.SuppressLint;

import android.net.NetworkCapabilities;

import android.net.vcn.VcnUnderlyingNetworkTemplate.MatchCriteria;

import android.net.vcn.util.PersistableBundleUtils;

import android.os.PersistableBundle;

import android.util.ArraySet;

import android.util.IndentingPrintWriter;



import com.android.internal.annotations.VisibleForTesting;

import com.android.server.vcn.util.PersistableBundleUtils;



import java.util.ArrayList;

import java.util.Collections;