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

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

Merge "Use SystemApi framework parcelables directly" am: 021ea66a 

am: 4864ffd9

Change-Id: I28b60bcaf76d8902f3cd9d7956931c98d8d85710
parents 50c9cca3 4864ffd9

services/net/java/android/net/StaticIpConfigurationParcelable.aidl→core/java/android/net/StaticIpConfiguration.aidl

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


package android.net;



import android.net.LinkAddress;



parcelable StaticIpConfigurationParcelable {

    LinkAddress ipAddress;

    String gateway;

    String[] dnsServers;

    String domains;

}
 
@JavaOnlyStableParcelable parcelable StaticIpConfiguration;
 
 No newline at end of file

core/java/android/net/apf/ApfCapabilities.aidl

0 → 100644
+20 −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.apf;



@JavaOnlyStableParcelable parcelable ApfCapabilities;
 
 No newline at end of file

services/net/Android.bp

+0 −2
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ aidl_interface { 
    local_include_dir: "java",

    include_dirs: ["frameworks/base/core/java"],  // For framework parcelables.

    srcs: [

        "java/android/net/ApfCapabilitiesParcelable.aidl",

        "java/android/net/DhcpResultsParcelable.aidl",

        "java/android/net/IIpMemoryStore.aidl",

        "java/android/net/IIpMemoryStoreCallbacks.aidl",
@@ -36,7 +35,6 @@ aidl_interface { 
        "java/android/net/InitialConfigurationParcelable.aidl",

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

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

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

        "java/android/net/TcpKeepalivePacketDataParcelable.aidl",

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

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

services/net/java/android/net/ApfCapabilitiesParcelable.aidl

deleted100644 → 0
+0 −23
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 ApfCapabilitiesParcelable {

    int apfVersionSupported;

    int maximumApfProgramSize;

    int apfPacketFormat;

}
 
 No newline at end of file

services/net/java/android/net/DhcpResultsParcelable.aidl

+2 −2
Original line number Diff line number Diff line
@@ -16,10 +16,10 @@ 


package android.net;



import android.net.StaticIpConfigurationParcelable;

import android.net.StaticIpConfiguration;



parcelable DhcpResultsParcelable {

    StaticIpConfigurationParcelable baseConfiguration;

    StaticIpConfiguration baseConfiguration;

    int leaseDuration;

    int mtu;

    String serverAddress;