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

Commit 3bbc506c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Freeze Networkstack AIDL API as V6" into rvc-dev am: 76e2b1e7 

Change-Id: I87a69bb5489e0528a9edd8d7d605d2ecd5aa1336
parents fbae0a7a 76e2b1e7

common/networkstackclient/Android.bp

+4 −3
Original line number Original line Diff line number Diff line
@@ -45,7 +45,7 @@ aidl_interface { 
        "5",

        "5",

    ],

    ],

    visibility: [

    visibility: [

        "//system/tools/aidl/build"

        "//system/tools/aidl/build",

    ],

    ],

}

}
@@ -97,11 +97,12 @@ aidl_interface { 
        "3",

        "3",

        "4",

        "4",

        "5",

        "5",

        "6",

    ],

    ],

    // TODO: have tethering depend on networkstack-client and set visibility to private

    // TODO: have tethering depend on networkstack-client and set visibility to private

    visibility: [

    visibility: [

        "//system/tools/aidl/build",

        "//system/tools/aidl/build",

        "//frameworks/base/packages/Tethering"

        "//frameworks/base/packages/Tethering",

    ],

    ],

}

}
@@ -123,5 +124,5 @@ java_library { 
        "//frameworks/base/services/net",

        "//frameworks/base/services/net",

        "//frameworks/opt/net/wifi/service",

        "//frameworks/opt/net/wifi/service",

        "//packages/modules/NetworkStack",

        "//packages/modules/NetworkStack",

    ]

    ],

}
 
}

common/networkstackclient/aidl_api/networkstack-aidl-interfaces/6/.hash

0 → 100644
+1 −0
Original line number Original line Diff line number Diff line 
a3d1d41c172015deec4d05d66926b90fd8b38b64

common/networkstackclient/aidl_api/networkstack-aidl-interfaces/6/android/net/DataStallReportParcelable.aidl

0 → 100644
+25 −0
Original line number Original line Diff line number Diff line 
///////////////////////////////////////////////////////////////////////////////

// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //

///////////////////////////////////////////////////////////////////////////////



// This file is a snapshot of an AIDL interface (or parcelable). Do not try to

// edit this file. It looks like you are doing that because you have modified

// an AIDL interface in a backward-incompatible way, e.g., deleting a function

// from an interface or a field from a parcelable and it broke the build. That

// breakage is intended.

//

// You must not make a backward incompatible changes to the AIDL files built

// with the aidl_interface module type with versions property set. The module

// type is used to build AIDL files in a way that they can be used across

// independently updatable components of the system. If a device is shipped

// with such a backward incompatible change, it has a high risk of breaking

// later when a module using the interface is updated, e.g., Mainline modules.



package android.net;

parcelable DataStallReportParcelable {

  long timestampMillis = 0;

  int detectionMethod = 1;

  int tcpPacketFailRate = 2;

  int tcpMetricsCollectionPeriodMillis = 3;

  int dnsConsecutiveTimeouts = 4;

}

common/networkstackclient/aidl_api/networkstack-aidl-interfaces/6/android/net/DhcpResultsParcelable.aidl

0 → 100644
+27 −0
Original line number Original line Diff line number Diff line 
///////////////////////////////////////////////////////////////////////////////

// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //

///////////////////////////////////////////////////////////////////////////////



// This file is a snapshot of an AIDL interface (or parcelable). Do not try to

// edit this file. It looks like you are doing that because you have modified

// an AIDL interface in a backward-incompatible way, e.g., deleting a function

// from an interface or a field from a parcelable and it broke the build. That

// breakage is intended.

//

// You must not make a backward incompatible changes to the AIDL files built

// with the aidl_interface module type with versions property set. The module

// type is used to build AIDL files in a way that they can be used across

// independently updatable components of the system. If a device is shipped

// with such a backward incompatible change, it has a high risk of breaking

// later when a module using the interface is updated, e.g., Mainline modules.



package android.net;

parcelable DhcpResultsParcelable {

  android.net.StaticIpConfiguration baseConfiguration;

  int leaseDuration;

  int mtu;

  String serverAddress;

  String vendorInfo;

  @nullable String serverHostName;

  @nullable String captivePortalApiUrl;

}

common/networkstackclient/aidl_api/networkstack-aidl-interfaces/6/android/net/INetworkMonitor.aidl

0 → 100644
+42 −0
Original line number Original line Diff line number Diff line 
///////////////////////////////////////////////////////////////////////////////

// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //

///////////////////////////////////////////////////////////////////////////////



// This file is a snapshot of an AIDL interface (or parcelable). Do not try to

// edit this file. It looks like you are doing that because you have modified

// an AIDL interface in a backward-incompatible way, e.g., deleting a function

// from an interface or a field from a parcelable and it broke the build. That

// breakage is intended.

//

// You must not make a backward incompatible changes to the AIDL files built

// with the aidl_interface module type with versions property set. The module

// type is used to build AIDL files in a way that they can be used across

// independently updatable components of the system. If a device is shipped

// with such a backward incompatible change, it has a high risk of breaking

// later when a module using the interface is updated, e.g., Mainline modules.



package android.net;

/* @hide */

interface INetworkMonitor {

  oneway void start();

  oneway void launchCaptivePortalApp();

  oneway void notifyCaptivePortalAppFinished(int response);

  oneway void setAcceptPartialConnectivity();

  oneway void forceReevaluation(int uid);

  oneway void notifyPrivateDnsChanged(in android.net.PrivateDnsConfigParcel config);

  oneway void notifyDnsResponse(int returnCode);

  oneway void notifyNetworkConnected(in android.net.LinkProperties lp, in android.net.NetworkCapabilities nc);

  oneway void notifyNetworkDisconnected();

  oneway void notifyLinkPropertiesChanged(in android.net.LinkProperties lp);

  oneway void notifyNetworkCapabilitiesChanged(in android.net.NetworkCapabilities nc);

  const int NETWORK_TEST_RESULT_VALID = 0;

  const int NETWORK_TEST_RESULT_INVALID = 1;

  const int NETWORK_TEST_RESULT_PARTIAL_CONNECTIVITY = 2;

  const int NETWORK_VALIDATION_RESULT_VALID = 1;

  const int NETWORK_VALIDATION_RESULT_PARTIAL = 2;

  const int NETWORK_VALIDATION_PROBE_DNS = 4;

  const int NETWORK_VALIDATION_PROBE_HTTP = 8;

  const int NETWORK_VALIDATION_PROBE_HTTPS = 16;

  const int NETWORK_VALIDATION_PROBE_FALLBACK = 32;

  const int NETWORK_VALIDATION_PROBE_PRIVDNS = 64;

}