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

Commit d25c7f1b authored by Chalard Jean's avatar Chalard Jean
Browse files

Freeze NetworkStack API version 14

Diff, with comments removed :

diff -U10 -ru -N 13/android/net/INetworkMonitor.aidl 14/android/net/INetworkMonitor.aidl

Change-Id: I6dc2313d5670b39126e2aaee10baca80cc97ba3f
--- 13/android/net/INetworkMonitor.aidl 2021-12-08 14:52:39.960409107 +0900
+++ 14/android/net/INetworkMonitor.aidl 2022-02-09 15:45:00.702882745 +0900
@@ -38,20 +38,21 @@
   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);
+  oneway void notifyNetworkConnectedParcel(in android.net.networkstack.aidl.NetworkMonitorParameters params);
   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_RESULT_SKIPPED = 4;
   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;
diff -U10 -ru -N 13/android/net/networkstack/aidl/NetworkMonitorParameters.aidl 14/android/net/networkstack/aidl/NetworkMonitorParameters.aidl
--- 13/android/net/networkstack/aidl/NetworkMonitorParameters.aidl      1970-01-01 09:00:00.000000000 +0900
+++ 14/android/net/networkstack/aidl/NetworkMonitorParameters.aidl      2022-02-09 15:45:00.702882745 +0900
@@ -0,0 +1,41 @@
+package android.net.networkstack.aidl;
+@JavaDerive(equals=true, toString=true)
+parcelable NetworkMonitorParameters {
+  android.net.NetworkAgentConfig networkAgentConfig;
+  android.net.NetworkCapabilities networkCapabilities;
+  android.net.LinkProperties linkProperties;
+}
diff -U10 -ru -N 13/.hash 14/.hash
--- 13/.hash    2021-12-08 14:52:39.960409107 +0900
+++ 14/.hash    2022-02-09 15:45:00.702882745 +0900
@@ -1 +1 @@
-8adb67bdf8c295e5bf053155269198fba9ab021e
+76b76d8bfc2fdacc6f5989fc9ec18abff61bfa32

Test: together with usage, which is a separate patch on top of this
Change-Id: I8a51066a923f27dc559f9d0b74139f5a82528571
parent 1441935d
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -142,6 +142,7 @@ aidl_interface {
        "11",
        "12",
        "13",
        "14",
    ],
    // TODO: have tethering depend on networkstack-client and set visibility to private
    visibility: [
+1 −0
Original line number Diff line number Diff line
76b76d8bfc2fdacc6f5989fc9ec18abff61bfa32
+42 −0
Original line number Diff line number Diff line
/**
 * Copyright (c) 2020, The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *     http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing perNmissions and
 * limitations under the License.
 */
///////////////////////////////////////////////////////////////////////////////
// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
///////////////////////////////////////////////////////////////////////////////

// This file is a snapshot of an AIDL file. Do not edit it manually. There are
// two cases:
// 1). this is a frozen version file - do not edit this in any case.
// 2). this is a 'current' file. If you make a backwards compatible change to
//     the interface (from the latest frozen version), the build system will
//     prompt you to update this file with `m <name>-update-api`.
//
// You must not make a backward incompatible change to any AIDL file 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;
@JavaDerive(toString=true)
parcelable DataStallReportParcelable {
  long timestampMillis = 0;
  int detectionMethod = 1;
  int tcpPacketFailRate = 2;
  int tcpMetricsCollectionPeriodMillis = 3;
  int dnsConsecutiveTimeouts = 4;
}
+44 −0
Original line number Diff line number Diff line
/**
 * Copyright (c) 2019, The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *     http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing perNmissions and
 * limitations under the License.
 */
///////////////////////////////////////////////////////////////////////////////
// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
///////////////////////////////////////////////////////////////////////////////

// This file is a snapshot of an AIDL file. Do not edit it manually. There are
// two cases:
// 1). this is a frozen version file - do not edit this in any case.
// 2). this is a 'current' file. If you make a backwards compatible change to
//     the interface (from the latest frozen version), the build system will
//     prompt you to update this file with `m <name>-update-api`.
//
// You must not make a backward incompatible change to any AIDL file 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;
@JavaDerive(toString=true)
parcelable DhcpResultsParcelable {
  android.net.StaticIpConfiguration baseConfiguration;
  int leaseDuration;
  int mtu;
  String serverAddress;
  String vendorInfo;
  @nullable String serverHostName;
  @nullable String captivePortalApiUrl;
}
+60 −0
Original line number Diff line number Diff line
/**
 * Copyright (c) 2018, The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *     http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing perNmissions and
 * limitations under the License.
 */
///////////////////////////////////////////////////////////////////////////////
// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
///////////////////////////////////////////////////////////////////////////////

// This file is a snapshot of an AIDL file. Do not edit it manually. There are
// two cases:
// 1). this is a frozen version file - do not edit this in any case.
// 2). this is a 'current' file. If you make a backwards compatible change to
//     the interface (from the latest frozen version), the build system will
//     prompt you to update this file with `m <name>-update-api`.
//
// You must not make a backward incompatible change to any AIDL file 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);
  oneway void notifyNetworkConnectedParcel(in android.net.networkstack.aidl.NetworkMonitorParameters params);
  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_RESULT_SKIPPED = 4;
  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;
}
Loading