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

Commit 51b9ccb1 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by Automerger Merge Worker
Browse files

Merge "Split out the connectivity API surface" am: 3d31f1ea am: 587784cd 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iced065c53194f4c5bd54198e05ddc455a97ba50e
parents 04580848 587784cd

Android.bp

+5 −1
Original line number Diff line number Diff line
@@ -333,7 +333,6 @@ filegroup { 
    srcs: [

        // Java/AIDL sources under frameworks/base

        ":framework-blobstore-sources",

        ":framework-connectivity-sources", // framework-connectivity is not yet a module

        ":framework-core-sources",

        ":framework-drm-sources",

        ":framework-graphics-sources",
@@ -395,6 +394,7 @@ filegroup { 
filegroup {

    name: "framework-updatable-sources",

    srcs: [

        ":framework-connectivity-sources",

        ":framework-mediaprovider-sources",

        ":framework-permission-sources",

        ":framework-sdkextensions-sources",
@@ -580,6 +580,7 @@ java_library { 
    defaults: ["framework-aidl-export-defaults"],

    srcs: [

        ":framework-non-updatable-sources",

        ":framework-connectivity-sources",

        "core/java/**/*.logtags",

    ],

    // See comment on framework-atb-backward-compatibility module below
@@ -628,6 +629,8 @@ java_library { 
    apex_available: ["//apex_available:platform"],

    visibility: [

        "//frameworks/base",

        // TODO: remove when framework-connectivity can build against API

        "//frameworks/base/packages/Connectivity/framework",

        // TODO(b/147128803) remove the below lines

        "//frameworks/base/apex/blobstore/framework",

        "//frameworks/base/apex/jobscheduler/framework",
@@ -1281,6 +1284,7 @@ java_library { 
    ],

    libs: [

        "framework-annotations-lib",

        "framework-connectivity",

        "unsupportedappusage",

    ],

    visibility: [

StubLibraries.bp

+6 −0
Original line number Diff line number Diff line
@@ -57,6 +57,9 @@ stubs_defaults { 
    aidl: {

        local_include_dirs: [

            "apex/media/aidl/stable",

            // TODO: move to include-dirs for packages/modules/Connectivity when this moves out of

            // frameworks/base

            "packages/Connectivity/framework/aidl-export",

            "telephony/java",

        ],

    },
@@ -306,6 +309,7 @@ java_library_static { 
        "android.net.ipsec.ike.stubs",

        "art.module.public.api.stubs",

        "conscrypt.module.public.api.stubs",

        "framework-connectivity.stubs",

        "framework-media.stubs",

        "framework-mediaprovider.stubs",

        "framework-permission.stubs",
@@ -326,6 +330,7 @@ java_library_static { 
        "android.net.ipsec.ike.stubs.system",

        "art.module.public.api.stubs",

        "conscrypt.module.public.api.stubs",

        "framework-connectivity.stubs.system",

        "framework-media.stubs.system",

        "framework-mediaprovider.stubs.system",

        "framework-permission.stubs.system",
@@ -362,6 +367,7 @@ java_library_static { 
        "android.net.ipsec.ike.stubs.system",

        "art.module.public.api.stubs",

        "conscrypt.module.public.api.stubs",

        "framework-connectivity.stubs.system",

        "framework-media.stubs.system",

        "framework-mediaprovider.stubs.system",

        "framework-permission.stubs.system",

api/Android.bp

+7 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ genrule { 
        ":android.net.ipsec.ike{.public.api.txt}",

        ":art.module.public.api{.public.api.txt}",

        ":conscrypt.module.public.api{.public.api.txt}",

        ":framework-connectivity{.public.api.txt}",

        ":framework-media{.public.api.txt}",

        ":framework-mediaprovider{.public.api.txt}",

        ":framework-permission{.public.api.txt}",
@@ -90,6 +91,7 @@ genrule { 
        ":api-stubs-docs-non-updatable",

        ":art.module.public.api{.public.stubs.source}",

        ":conscrypt.module.public.api{.public.stubs.source}",

        ":framework-connectivity{.public.stubs.source}",

        ":framework-media{.public.stubs.source}",

        ":framework-mediaprovider{.public.stubs.source}",

        ":framework-permission{.public.stubs.source}",
@@ -111,6 +113,7 @@ genrule { 
        ":android.net.ipsec.ike{.public.removed-api.txt}",

        ":art.module.public.api{.public.removed-api.txt}",

        ":conscrypt.module.public.api{.public.removed-api.txt}",

        ":framework-connectivity{.public.removed-api.txt}",

        ":framework-media{.public.removed-api.txt}",

        ":framework-mediaprovider{.public.removed-api.txt}",

        ":framework-permission{.public.removed-api.txt}",
@@ -142,6 +145,7 @@ genrule { 
    name: "frameworks-base-api-system-current.txt",

    srcs: [

        ":android.net.ipsec.ike{.system.api.txt}",

        ":framework-connectivity{.system.api.txt}",

        ":framework-media{.system.api.txt}",

        ":framework-mediaprovider{.system.api.txt}",

        ":framework-permission{.system.api.txt}",
@@ -191,6 +195,7 @@ genrule { 
    name: "frameworks-base-api-system-removed.txt",

    srcs: [

        ":android.net.ipsec.ike{.system.removed-api.txt}",

        ":framework-connectivity{.system.removed-api.txt}",

        ":framework-media{.system.removed-api.txt}",

        ":framework-mediaprovider{.system.removed-api.txt}",

        ":framework-permission{.system.removed-api.txt}",
@@ -222,6 +227,7 @@ genrule { 
    name: "frameworks-base-api-module-lib-current.txt",

    srcs: [

        ":android.net.ipsec.ike{.module-lib.api.txt}",

        ":framework-connectivity{.module-lib.api.txt}",

        ":framework-media{.module-lib.api.txt}",

        ":framework-mediaprovider{.module-lib.api.txt}",

        ":framework-permission{.module-lib.api.txt}",
@@ -273,6 +279,7 @@ genrule { 
    name: "frameworks-base-api-module-lib-removed.txt",

    srcs: [

        ":android.net.ipsec.ike{.module-lib.removed-api.txt}",

        ":framework-connectivity{.module-lib.removed-api.txt}",

        ":framework-media{.module-lib.removed-api.txt}",

        ":framework-mediaprovider{.module-lib.removed-api.txt}",

        ":framework-permission{.module-lib.removed-api.txt}",

core/api/current.txt

+0 −464

File changed.

Preview size limit exceeded, changes collapsed.

core/api/module-lib-current.txt

+0 −61
Original line number Diff line number Diff line
@@ -10,67 +10,14 @@ package android.app { 


package android.net {



  public final class ConnectivityFrameworkInitializer {

    method public static void registerServiceWrappers();

  }



  public class ConnectivityManager {

    method @RequiresPermission(anyOf={android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, android.Manifest.permission.NETWORK_SETTINGS}) public void registerSystemDefaultNetworkCallback(@NonNull android.net.ConnectivityManager.NetworkCallback, @NonNull android.os.Handler);

    method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_STACK, android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK}) public void requestBackgroundNetwork(@NonNull android.net.NetworkRequest, @Nullable android.os.Handler, @NonNull android.net.ConnectivityManager.NetworkCallback);

    method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_TEST_NETWORKS, android.Manifest.permission.NETWORK_STACK}) public void simulateDataStall(int, long, @NonNull android.net.Network, @NonNull android.os.PersistableBundle);

  }



  public static final class IpSecManager.UdpEncapsulationSocket implements java.lang.AutoCloseable {

    method public int getResourceId();

  }



  public final class NetworkAgentConfig implements android.os.Parcelable {

    method @Nullable public String getSubscriberId();

  }



  public static final class NetworkAgentConfig.Builder {

    method @NonNull public android.net.NetworkAgentConfig.Builder setSubscriberId(@Nullable String);

  }



  public final class NetworkCapabilities implements android.os.Parcelable {

    field public static final int TRANSPORT_TEST = 7; // 0x7

  }



  public class NetworkWatchlistManager {

    method @Nullable public byte[] getWatchlistConfigHash();

  }



  public final class Proxy {

    method public static void setHttpProxyConfiguration(@Nullable android.net.ProxyInfo);

  }



  public final class TcpRepairWindow {

    ctor public TcpRepairWindow(int, int, int, int, int, int);

    field public final int maxWindow;

    field public final int rcvWnd;

    field public final int rcvWndScale;

    field public final int rcvWup;

    field public final int sndWl1;

    field public final int sndWnd;

  }



  public final class TestNetworkInterface implements android.os.Parcelable {

    ctor public TestNetworkInterface(@NonNull android.os.ParcelFileDescriptor, @NonNull String);

    method public int describeContents();

    method @NonNull public android.os.ParcelFileDescriptor getFileDescriptor();

    method @NonNull public String getInterfaceName();

    method public void writeToParcel(@NonNull android.os.Parcel, int);

    field @NonNull public static final android.os.Parcelable.Creator<android.net.TestNetworkInterface> CREATOR;

  }



  public class TestNetworkManager {

    method @NonNull public android.net.TestNetworkInterface createTapInterface();

    method @NonNull public android.net.TestNetworkInterface createTunInterface(@NonNull java.util.Collection<android.net.LinkAddress>);

    method public void setupTestNetwork(@NonNull String, @NonNull android.os.IBinder);

    method public void teardownTestNetwork(@NonNull android.net.Network);

    field public static final String TEST_TAP_PREFIX = "testtap";

  }



  public final class UnderlyingNetworkInfo implements android.os.Parcelable {

    ctor public UnderlyingNetworkInfo(int, @NonNull String, @NonNull java.util.List<java.lang.String>);

    method public int describeContents();
@@ -81,14 +28,6 @@ package android.net { 
    field @NonNull public final java.util.List<java.lang.String> underlyingIfaces;

  }



  public final class VpnTransportInfo implements android.os.Parcelable android.net.TransportInfo {

    ctor public VpnTransportInfo(int);

    method public int describeContents();

    method public void writeToParcel(@NonNull android.os.Parcel, int);

    field @NonNull public static final android.os.Parcelable.Creator<android.net.VpnTransportInfo> CREATOR;

    field public final int type;

  }



}



package android.os {