diff options
| author | Bernie Innocenti <codewiz@google.com> | 2018-05-11 02:14:30 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-05-11 02:14:30 +0000 |
| commit | f9f970b1fa45d917adb3ff7bac12cf1c1e06bb8f (patch) | |
| tree | 2eb480ef4645be2bd18da0d4c3ec9ef61e07b735 | |
| parent | a9458983e3fc6ef0c64db1e1af82ecb1fe0183ff (diff) | |
| parent | d1895cb79ad3783dfaf56ae06a5541d93ba25a80 (diff) | |
Merge "Revert "Temporarily disable APF on automotive platforms"" into pi-dev
| -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 8f213dfee..5161a3117 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; @@ -5005,17 +5004,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() @@ -5024,7 +5016,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(); |