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

Commit dc9ef640 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Move NetworkStackClient lib to NetworkStack folder"

parents bc1a1013 bbb9703b
Loading
Loading
Loading
Loading
+1 −2
Original line number Diff line number Diff line
@@ -74,9 +74,8 @@ java_defaults {
    ],
    static_libs: [
        "androidx.annotation_annotation",
        "ipmemorystore-client",
        "netd_aidl_interface-V2-java",
        "networkstack-aidl-interfaces-V3-java",
        "networkstack-client",
        "datastallprotosnano",
        "networkstackprotosnano",
        "captiveportal-lib",
+92 −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 permissions and
// limitations under the License.
//

// AIDL interfaces between the core system and the networking mainline module.
aidl_interface {
    name: "ipmemorystore-aidl-interfaces",
    local_include_dir: "src",
    srcs: [
        "src/android/net/IIpMemoryStore.aidl",
        "src/android/net/IIpMemoryStoreCallbacks.aidl",
        "src/android/net/ipmemorystore/**/*.aidl",
    ],
    backend: {
        ndk: {
            enabled: false,
        },
        cpp: {
            enabled: false,
        },
    },
    api_dir: "aidl/ipmemorystore",
    versions: [
        "1",
        "2",
        "3",
    ],
}

aidl_interface {
    name: "networkstack-aidl-interfaces",
    local_include_dir: "src",
    include_dirs: ["frameworks/base/core/java"], // For framework parcelables.
    srcs: [
        "src/android/net/DhcpResultsParcelable.aidl",
        "src/android/net/INetworkMonitor.aidl",
        "src/android/net/INetworkMonitorCallbacks.aidl",
        "src/android/net/INetworkStackConnector.aidl",
        "src/android/net/INetworkStackStatusCallback.aidl",
        "src/android/net/InitialConfigurationParcelable.aidl",
        "src/android/net/NattKeepalivePacketDataParcelable.aidl",
        "src/android/net/PrivateDnsConfigParcel.aidl",
        "src/android/net/ProvisioningConfigurationParcelable.aidl",
        "src/android/net/TcpKeepalivePacketDataParcelable.aidl",
        "src/android/net/dhcp/DhcpServingParamsParcel.aidl",
        "src/android/net/dhcp/IDhcpServer.aidl",
        "src/android/net/dhcp/IDhcpServerCallbacks.aidl",
        "src/android/net/ip/IIpClient.aidl",
        "src/android/net/ip/IIpClientCallbacks.aidl",
    ],
    backend: {
        ndk: {
            enabled: false,
        },
        cpp: {
            enabled: false,
        },
    },
    api_dir: "aidl/networkstack",
    imports: ["ipmemorystore-aidl-interfaces"],
    versions: [
        "1",
        "2",
        "3",
    ],
}

java_library {
    name: "networkstack-client",
    sdk_version: "system_current",
    srcs: [
        ":framework-annotations",
        "src/android/net/IpMemoryStoreClient.java",
        "src/android/net/ipmemorystore/**/*.java",
    ],
    static_libs: [
        "ipmemorystore-aidl-interfaces-V3-java",
        "networkstack-aidl-interfaces-V3-java",
    ],
}
+9 −0
Original line number Diff line number Diff line
package android.net;
interface IIpMemoryStore {
  oneway void storeNetworkAttributes(String l2Key, in android.net.ipmemorystore.NetworkAttributesParcelable attributes, android.net.ipmemorystore.IOnStatusListener listener);
  oneway void storeBlob(String l2Key, String clientId, String name, in android.net.ipmemorystore.Blob data, android.net.ipmemorystore.IOnStatusListener listener);
  oneway void findL2Key(in android.net.ipmemorystore.NetworkAttributesParcelable attributes, android.net.ipmemorystore.IOnL2KeyResponseListener listener);
  oneway void isSameNetwork(String l2Key1, String l2Key2, android.net.ipmemorystore.IOnSameL3NetworkResponseListener listener);
  oneway void retrieveNetworkAttributes(String l2Key, android.net.ipmemorystore.IOnNetworkAttributesRetrievedListener listener);
  oneway void retrieveBlob(String l2Key, String clientId, String name, android.net.ipmemorystore.IOnBlobRetrievedListener listener);
}
+4 −0
Original line number Diff line number Diff line
package android.net;
interface IIpMemoryStoreCallbacks {
  oneway void onIpMemoryStoreFetched(in android.net.IIpMemoryStore ipMemoryStore);
}
+4 −0
Original line number Diff line number Diff line
package android.net.ipmemorystore;
parcelable Blob {
  byte[] data;
}
Loading