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

Commit 462e944f authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by android-build-merger
Browse files

Merge "Remove aidl wrappers for framework parcelables" am: 1a139607 am: 7cf43a2f

am: 5fd40295

Change-Id: I019fbbfd5dde5268cbb38bdaee1bc50a434372bc
parents d20bf0ef 5fd40295
Loading
Loading
Loading
Loading
+8 −5
Original line number Diff line number Diff line
@@ -903,14 +903,9 @@ aidl_interface {
        "core/java/android/net/INetworkStackConnector.aidl",
        "core/java/android/net/INetworkStackStatusCallback.aidl",
        "core/java/android/net/InitialConfigurationParcelable.aidl",
        "core/java/android/net/IpPrefixParcelable.aidl",
        "core/java/android/net/LinkAddressParcelable.aidl",
        "core/java/android/net/LinkPropertiesParcelable.aidl",
        "core/java/android/net/NetworkParcelable.aidl",
        "core/java/android/net/PrivateDnsConfigParcel.aidl",
        "core/java/android/net/ProvisioningConfigurationParcelable.aidl",
        "core/java/android/net/ProxyInfoParcelable.aidl",
        "core/java/android/net/RouteInfoParcelable.aidl",
        "core/java/android/net/StaticIpConfigurationParcelable.aidl",
        "core/java/android/net/TcpKeepalivePacketDataParcelable.aidl",
        "core/java/android/net/dhcp/DhcpServingParamsParcel.aidl",
@@ -919,6 +914,14 @@ aidl_interface {
        "core/java/android/net/ip/IIpClient.aidl",
        "core/java/android/net/ip/IIpClientCallbacks.aidl",
    ],
    backend: {
        ndk: {
            enabled: false,
        },
        cpp: {
            enabled: false,
        },
    },
    api_dir: "aidl/networkstack",
}

+4 −4
Original line number Diff line number Diff line
@@ -16,12 +16,12 @@

package android.net;

import android.net.IpPrefixParcelable;
import android.net.LinkAddressParcelable;
import android.net.IpPrefix;
import android.net.LinkAddress;

parcelable InitialConfigurationParcelable {
    LinkAddressParcelable[] ipAddresses;
    IpPrefixParcelable[] directlyConnectedRoutes;
    LinkAddress[] ipAddresses;
    IpPrefix[] directlyConnectedRoutes;
    String[] dnsServers;
    String gateway;
}
 No newline at end of file
+3 −1
Original line number Diff line number Diff line
@@ -17,4 +17,6 @@

package android.net;

parcelable IpPrefix cpp_header "binder/IpPrefix.h";
// @JavaOnlyStableParcelable only affects the parcelable when built as stable aidl (aidl_interface
// build rule). IpPrefix is also used in cpp but only as non-stable aidl.
@JavaOnlyStableParcelable parcelable IpPrefix cpp_header "binder/IpPrefix.h";
+0 −22
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 permissions and
 * limitations under the License.
*/

package android.net;

parcelable IpPrefixParcelable {
    String address;
    int prefixLength;
}
 No newline at end of file
+1 −1
Original line number Diff line number Diff line
@@ -17,5 +17,5 @@

package android.net;

parcelable LinkAddress;
@JavaOnlyStableParcelable parcelable LinkAddress;
Loading