diff options
author | 2024-12-27 14:25:58 -0800 | |
---|---|---|
committer | 2024-12-27 14:25:58 -0800 | |
commit | 460481df832690a16548330ebfc94aad63de276d (patch) | |
tree | 0d6c189bb00bf0b003940b739fe654a3bcc97c17 /framework/java | |
parent | 3a8a5dc731dc34782dd74d5af6c60ea2f54571c9 (diff) | |
parent | 83274c7424afc98522e9424a49190bdfaebbf296 (diff) |
Merge "Revert "[AAPM] Update WEP feature identifier"" into main
Diffstat (limited to 'framework/java')
-rw-r--r-- | framework/java/android/net/wifi/WifiManager.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/framework/java/android/net/wifi/WifiManager.java b/framework/java/android/net/wifi/WifiManager.java index 121ee0374a..bb20630e0a 100644 --- a/framework/java/android/net/wifi/WifiManager.java +++ b/framework/java/android/net/wifi/WifiManager.java @@ -81,7 +81,6 @@ import android.os.RemoteException; import android.os.WorkSource; import android.os.connectivity.WifiActivityEnergyInfo; import android.security.advancedprotection.AdvancedProtectionFeature; -import android.security.advancedprotection.AdvancedProtectionManager; import android.telephony.SubscriptionInfo; import android.text.TextUtils; import android.util.ArraySet; @@ -13221,8 +13220,8 @@ public class WifiManager { } List<AdvancedProtectionFeature> features = new ArrayList<>(); if (Flags.wepDisabledInApm()) { - features.add(new AdvancedProtectionFeature( - AdvancedProtectionManager.FEATURE_ID_DISALLOW_WEP)); + // TODO: b/362586268 Change to AdvancedProtectionManager.FEATURE_ID_DISALLOW_WEP + features.add(new AdvancedProtectionFeature("WEP")); } return features; } |