From 35b3843cccd40907b06d036e7d16f58cfcddcc69 Mon Sep 17 00:00:00 2001
From: Hai Shalom <haishalom@google.com>
Date: Thu, 30 Jan 2020 10:37:55 -0800
Subject: [PATCH] [WPA3] Restore @hide to WifiConfiguration#SuiteBCipher

Following up on API council review, restore the @hide
to WifiConfiguration#SuiteBCipher and removed the link
to it from WifiConfiguration#allowedSuiteBCiphers.
SuiteBCipher is used internally.

Bug: 148515393
Test: Compiles
Change-Id: I8fe85295f807d5f9ec1b00585026dc01b7c0f29a
---
 api/current.txt                                   | 5 -----
 wifi/java/android/net/wifi/WifiConfiguration.java | 5 +++--
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/api/current.txt b/api/current.txt
index ca4e52db2419a..29519beb59583 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -31129,11 +31129,6 @@ package android.net.wifi {
     field @Deprecated public static final String[] strings;
   }
 
-  @Deprecated public static class WifiConfiguration.SuiteBCipher {
-    field @Deprecated public static final int ECDHE_ECDSA = 0; // 0x0
-    field @Deprecated public static final int ECDHE_RSA = 1; // 0x1
-  }
-
   public class WifiEnterpriseConfig implements android.os.Parcelable {
     ctor public WifiEnterpriseConfig();
     ctor public WifiEnterpriseConfig(android.net.wifi.WifiEnterpriseConfig);
diff --git a/wifi/java/android/net/wifi/WifiConfiguration.java b/wifi/java/android/net/wifi/WifiConfiguration.java
index 0ef224a5f8ee7..372af42a3d14e 100644
--- a/wifi/java/android/net/wifi/WifiConfiguration.java
+++ b/wifi/java/android/net/wifi/WifiConfiguration.java
@@ -373,6 +373,7 @@ public class WifiConfiguration implements Parcelable {
      * ECDHE_ECDSA
      * ECDHE_RSA
      * </pre>
+     * @hide
      */
     public static class SuiteBCipher {
         private SuiteBCipher() { }
@@ -715,8 +716,8 @@ public class WifiConfiguration implements Parcelable {
     public BitSet allowedGroupManagementCiphers;
     /**
      * The set of SuiteB ciphers supported by this configuration.
-     * To be used for WPA3-Enterprise mode.
-     * See {@link SuiteBCipher} for descriptions of the values.
+     * To be used for WPA3-Enterprise mode. Set automatically by the framework based on the
+     * certificate type that is used in this configuration.
      */
     @NonNull
     public BitSet allowedSuiteBCiphers;