Remove StaticIpConfigurationParcelable and ApfCapabilitiesParcelable and use StaticIpConfiguration and ApfCapabilities directly. These two classes are SystemApi and defined in framework.jar, so no stability guarantee is needed: the parceled and unparceled class will always be the framework.jar version. Bug: 126477266 Fixes: 126477266 Test: atest FrameworksNetTests NetworkStackTests Test: flashed, booted, WiFi and captive portal works. Change-Id: Iaf80ae23e003752cc6d2300700021931923b6533
39 lines
1.2 KiB
Plaintext
39 lines
1.2 KiB
Plaintext
/*
|
|
**
|
|
** 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.InitialConfigurationParcelable;
|
|
import android.net.Network;
|
|
import android.net.StaticIpConfiguration;
|
|
import android.net.apf.ApfCapabilities;
|
|
|
|
parcelable ProvisioningConfigurationParcelable {
|
|
boolean enableIPv4;
|
|
boolean enableIPv6;
|
|
boolean usingMultinetworkPolicyTracker;
|
|
boolean usingIpReachabilityMonitor;
|
|
int requestedPreDhcpActionMs;
|
|
InitialConfigurationParcelable initialConfig;
|
|
StaticIpConfiguration staticIpConfig;
|
|
ApfCapabilities apfCapabilities;
|
|
int provisioningTimeoutMs;
|
|
int ipv6AddrGenMode;
|
|
Network network;
|
|
String displayName;
|
|
}
|