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

Commit 904a38be authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN
Browse files

Remove NetworkParcelable 

With the @JavaOnlyStableParcelable annotation, Network can now be used
as-is as a framework parcelable.

Test: atest FrameworksNetTests NetworkStackTests
Bug: 126477266
Change-Id: I5d9695a31b3ac48d10edcf08ccd0c34375353b79
parent e80be857

Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -831,7 +831,6 @@ aidl_interface { 
        "core/java/android/net/INetworkStackConnector.aidl",

        "core/java/android/net/INetworkStackStatusCallback.aidl",

        "core/java/android/net/InitialConfigurationParcelable.aidl",

        "core/java/android/net/NetworkParcelable.aidl",

        "core/java/android/net/PrivateDnsConfigParcel.aidl",

        "core/java/android/net/ProvisioningConfigurationParcelable.aidl",

        "core/java/android/net/StaticIpConfigurationParcelable.aidl",

core/java/android/net/INetworkStackConnector.aidl

+2 −3
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
package android.net;



import android.net.INetworkMonitorCallbacks;

import android.net.NetworkParcelable;

import android.net.Network;

import android.net.dhcp.DhcpServingParamsParcel;

import android.net.dhcp.IDhcpServerCallbacks;

import android.net.ip.IIpClientCallbacks;
@@ -25,7 +25,6 @@ import android.net.ip.IIpClientCallbacks; 
oneway interface INetworkStackConnector {

    void makeDhcpServer(in String ifName, in DhcpServingParamsParcel params,

        in IDhcpServerCallbacks cb);

    void makeNetworkMonitor(in NetworkParcelable network, String name,

        in INetworkMonitorCallbacks cb);

    void makeNetworkMonitor(in Network network, String name, in INetworkMonitorCallbacks cb);

    void makeIpClient(in String ifName, in IIpClientCallbacks callbacks);

}
 
 No newline at end of file

core/java/android/net/Network.aidl

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


package android.net;



parcelable Network;
 
@JavaOnlyStableParcelable parcelable Network;

core/java/android/net/NetworkParcelable.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 NetworkParcelable {

    long networkHandle;

}

core/java/android/net/ProvisioningConfigurationParcelable.aidl

+2 −2
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ package android.net; 


import android.net.ApfCapabilitiesParcelable;

import android.net.InitialConfigurationParcelable;

import android.net.NetworkParcelable;

import android.net.Network;

import android.net.StaticIpConfigurationParcelable;



parcelable ProvisioningConfigurationParcelable {
@@ -33,6 +33,6 @@ parcelable ProvisioningConfigurationParcelable { 
    ApfCapabilitiesParcelable apfCapabilities;

    int provisioningTimeoutMs;

    int ipv6AddrGenMode;

    NetworkParcelable network;

    Network network;

    String displayName;

}