summaryrefslogtreecommitdiff
path: root/framework/java
diff options
context:
space:
mode:
author Hani Kazmi <hanikazmi@google.com> 2025-01-03 09:25:46 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 2025-01-03 09:25:46 -0800
commita22d40f1e3e7f264019c3e40a4bc077567c658a9 (patch)
treef9c43639a20d819af41b83db614af1016e8240ed /framework/java
parent84a834fe895bd2fb58c1ac507ad7277ff605f0b1 (diff)
parentac9d6dc8c8ab2887b3f529f026c81874ef7457cc (diff)
Merge "Revert^2 "[AAPM] Update WEP feature identifier"" into main
Diffstat (limited to 'framework/java')
-rw-r--r--framework/java/android/net/wifi/WifiManager.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/framework/java/android/net/wifi/WifiManager.java b/framework/java/android/net/wifi/WifiManager.java
index bb20630e0a..121ee0374a 100644
--- a/framework/java/android/net/wifi/WifiManager.java
+++ b/framework/java/android/net/wifi/WifiManager.java
@@ -81,6 +81,7 @@ 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;
@@ -13220,8 +13221,8 @@ public class WifiManager {
}
List<AdvancedProtectionFeature> features = new ArrayList<>();
if (Flags.wepDisabledInApm()) {
- // TODO: b/362586268 Change to AdvancedProtectionManager.FEATURE_ID_DISALLOW_WEP
- features.add(new AdvancedProtectionFeature("WEP"));
+ features.add(new AdvancedProtectionFeature(
+ AdvancedProtectionManager.FEATURE_ID_DISALLOW_WEP));
}
return features;
}