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

Commit d6705345 authored by Chalard Jean's avatar Chalard Jean Committed by Aaron Huang
Browse files

Update NetworkAgentConfig API for council comments

Bug: 152238712
Test: FrameworksNetTests NetworkStackTests
Copy from ag/10826396
Change-Id: Idca9f243a5c955f4caa30921ee520e1a93b0d11a
Merged-In: Idca9f243a5c955f4caa30921ee520e1a93b0d11a
parent d2b02d4c
Loading
Loading
Loading
Loading
+1 −1
Original line number Original line Diff line number Diff line
@@ -4571,7 +4571,7 @@ package android.net {
    field @NonNull public static final android.os.Parcelable.Creator<android.net.NetworkAgentConfig> CREATOR;
    field @NonNull public static final android.os.Parcelable.Creator<android.net.NetworkAgentConfig> CREATOR;
  }
  }
  public static class NetworkAgentConfig.Builder {
  public static final class NetworkAgentConfig.Builder {
    ctor public NetworkAgentConfig.Builder();
    ctor public NetworkAgentConfig.Builder();
    method @NonNull public android.net.NetworkAgentConfig build();
    method @NonNull public android.net.NetworkAgentConfig build();
    method @NonNull public android.net.NetworkAgentConfig.Builder setExplicitlySelected(boolean);
    method @NonNull public android.net.NetworkAgentConfig.Builder setExplicitlySelected(boolean);
+30 −0
Original line number Original line Diff line number Diff line
@@ -705,6 +705,36 @@ public class ConnectivityManager {
    @Deprecated
    @Deprecated
    public static final int TYPE_TEST = 18; // TODO: Remove this once NetworkTypes are unused.
    public static final int TYPE_TEST = 18; // TODO: Remove this once NetworkTypes are unused.


    /**
     * @deprecated Use {@link NetworkCapabilities} instead.
     * @hide
     */
    @Deprecated
    @Retention(RetentionPolicy.SOURCE)
    @IntDef(prefix = { "TYPE_" }, value = {
                TYPE_NONE,
                TYPE_MOBILE,
                TYPE_WIFI,
                TYPE_MOBILE_MMS,
                TYPE_MOBILE_SUPL,
                TYPE_MOBILE_DUN,
                TYPE_MOBILE_HIPRI,
                TYPE_WIMAX,
                TYPE_BLUETOOTH,
                TYPE_DUMMY,
                TYPE_ETHERNET,
                TYPE_MOBILE_FOTA,
                TYPE_MOBILE_IMS,
                TYPE_MOBILE_CBS,
                TYPE_WIFI_P2P,
                TYPE_MOBILE_IA,
                TYPE_MOBILE_EMERGENCY,
                TYPE_PROXY,
                TYPE_VPN,
                TYPE_TEST
    })
    public @interface LegacyNetworkType {}

    // Deprecated constants for return values of startUsingNetworkFeature. They used to live
    // Deprecated constants for return values of startUsingNetworkFeature. They used to live
    // in com.android.internal.telephony.PhoneConstants until they were made inaccessible.
    // in com.android.internal.telephony.PhoneConstants until they were made inaccessible.
    private static final int DEPRECATED_PHONE_CONSTANT_APN_ALREADY_ACTIVE = 0;
    private static final int DEPRECATED_PHONE_CONSTANT_APN_ALREADY_ACTIVE = 0;
+2 −1
Original line number Original line Diff line number Diff line
@@ -155,6 +155,7 @@ public final class NetworkAgentConfig implements Parcelable {
    /**
    /**
     * @return the legacy type
     * @return the legacy type
     */
     */
    @ConnectivityManager.LegacyNetworkType
    public int getLegacyType() {
    public int getLegacyType() {
        return legacyType;
        return legacyType;
    }
    }
@@ -206,7 +207,7 @@ public final class NetworkAgentConfig implements Parcelable {
    /**
    /**
     * Builder class to facilitate constructing {@link NetworkAgentConfig} objects.
     * Builder class to facilitate constructing {@link NetworkAgentConfig} objects.
     */
     */
    public static class Builder {
    public static final class Builder {
        private final NetworkAgentConfig mConfig = new NetworkAgentConfig();
        private final NetworkAgentConfig mConfig = new NetworkAgentConfig();


        /**
        /**