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

Commit e80be857 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN
Browse files

Remove aidl wrappers for framework parcelables 

The new @JavaOnlyStableParcelable annotation allows using the framework
parcelables directly, which removes a lot of boilerplate.

Includes new copy constructors for IpPrefix and LinkAddress so they can
be copied easily as-is into parcelables.

Test: atest FrameworksNetTests
Test: booted, WiFi works
Bug: 126477266

Change-Id: Icac8afe498d0b5ebf9a0d0b9eceb14d64a29b381
parent 17492d06

Android.bp

+8 −5
Original line number Diff line number Diff line
@@ -831,14 +831,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",
@@ -847,6 +842,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",

}

core/java/android/net/InitialConfigurationParcelable.aidl

+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

core/java/android/net/IpPrefix.aidl

+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";

core/java/android/net/IpPrefixParcelable.aidl

deleted100644 → 0
+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

core/java/android/net/LinkAddress.aidl

+1 −1
Original line number Diff line number Diff line
@@ -17,5 +17,5 @@ 


package android.net;



parcelable LinkAddress;

@JavaOnlyStableParcelable parcelable LinkAddress;