diff options
| -rw-r--r-- | service/java/com/android/server/wifi/WifiStateMachine.java | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/service/java/com/android/server/wifi/WifiStateMachine.java b/service/java/com/android/server/wifi/WifiStateMachine.java index 4a0a24a21..1037b10f5 100644 --- a/service/java/com/android/server/wifi/WifiStateMachine.java +++ b/service/java/com/android/server/wifi/WifiStateMachine.java @@ -50,7 +50,6 @@ import android.net.NetworkUtils; import android.net.RouteInfo; import android.net.StaticIpConfiguration; import android.net.TrafficStats; -import android.net.apf.ApfCapabilities; import android.net.dhcp.DhcpClient; import android.net.ip.IpClient; import android.net.wifi.RssiPacketCountInfo; @@ -5028,17 +5027,10 @@ public class WifiStateMachine extends StateMachine { mIpClient.setTcpBufferSizes(mTcpBufferSizes); } final IpClient.ProvisioningConfiguration prov; - - ApfCapabilities apfCapabilities = mWifiNative.getApfCapabilities(mInterfaceName); - if (mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE)) { - // Temporarily disable APF on automotive platforms to work around b/78905546. - apfCapabilities = null; - } - if (!isUsingStaticIp) { prov = IpClient.buildProvisioningConfiguration() .withPreDhcpAction() - .withApfCapabilities(apfCapabilities) + .withApfCapabilities(mWifiNative.getApfCapabilities(mInterfaceName)) .withNetwork(getCurrentNetwork()) .withDisplayName(currentConfig.SSID) .withRandomMacAddress() @@ -5047,7 +5039,7 @@ public class WifiStateMachine extends StateMachine { StaticIpConfiguration staticIpConfig = currentConfig.getStaticIpConfiguration(); prov = IpClient.buildProvisioningConfiguration() .withStaticConfiguration(staticIpConfig) - .withApfCapabilities(apfCapabilities) + .withApfCapabilities(mWifiNative.getApfCapabilities(mInterfaceName)) .withNetwork(getCurrentNetwork()) .withDisplayName(currentConfig.SSID) .build(); |