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

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

Merge "Add stable AIDL parcelables for LinkProperties" am: c37177a7 

am: e45592f5

Change-Id: I301f9ccac2008c102dbc5e14e3654cf268e20d1d
parents 18a8e142 e45592f5

Android.bp

+5 −0
Original line number Diff line number Diff line
@@ -830,7 +830,12 @@ aidl_interface { 
        "core/java/android/net/IIpMemoryStore.aidl",

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

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

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

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

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

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

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

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

        "core/java/android/net/dhcp/DhcpServingParamsParcel.aidl",

        "core/java/android/net/dhcp/IDhcpServer.aidl",

        "core/java/android/net/dhcp/IDhcpServerCallbacks.aidl",

core/java/android/net/IpPrefixParcelable.aidl

0 → 100644
+22 −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 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/LinkAddressParcelable.aidl

0 → 100644
+24 −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 permissions and

 * limitations under the License.

*/



package android.net;



parcelable LinkAddressParcelable {

    String address;

    int prefixLength;

    int flags;

    int scope;

}
 
 No newline at end of file

core/java/android/net/LinkPropertiesParcelable.aidl

0 → 100644
+39 −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 permissions and

 * limitations under the License.

*/



package android.net;



import android.net.IpPrefixParcelable;

import android.net.LinkAddressParcelable;

import android.net.ProxyInfoParcelable;

import android.net.RouteInfoParcelable;



parcelable LinkPropertiesParcelable {

    String ifaceName;

    LinkAddressParcelable[] linkAddresses;

    String[] dnses;

    String[] pcscfs;

    String[] validatedPrivateDnses;

    boolean usePrivateDns;

    String privateDnsServerName;

    String domains;

    RouteInfoParcelable[] routes;

    ProxyInfoParcelable httpProxy;

    int mtu;

    String tcpBufferSizes;

    IpPrefixParcelable nat64Prefix;

    LinkPropertiesParcelable[] stackedLinks;

}
 
 No newline at end of file

core/java/android/net/ProxyInfoParcelable.aidl

0 → 100644
+24 −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 permissions and

 * limitations under the License.

*/



package android.net;



parcelable ProxyInfoParcelable {

    String host;

    int port;

    String[] exclusionList;

    String pacFileUrl;

}