diff options
| -rw-r--r-- | core/api/module-lib-current.txt | 11 | ||||
| -rw-r--r-- | core/api/system-current.txt | 7 | ||||
| -rw-r--r-- | wifi/java/src/android/net/wifi/WifiKeystore.java | 21 |
3 files changed, 21 insertions, 18 deletions
diff --git a/core/api/module-lib-current.txt b/core/api/module-lib-current.txt index 783bebd23df3..ec18fd7f5cfe 100644 --- a/core/api/module-lib-current.txt +++ b/core/api/module-lib-current.txt @@ -317,17 +317,6 @@ package android.net.netstats { } -package android.net.wifi { - - public final class WifiKeystore { - method @NonNull public static byte[] get(@NonNull String); - method @NonNull public static String[] list(@NonNull String); - method public static boolean put(@NonNull String, @NonNull byte[]); - method public static boolean remove(@NonNull String); - } - -} - package android.nfc { public class NfcServiceManager { diff --git a/core/api/system-current.txt b/core/api/system-current.txt index 66e03db5923b..4595cc28b711 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -9727,6 +9727,13 @@ package android.net.vcn { package android.net.wifi { + public final class WifiKeystore { + method @NonNull public static byte[] get(@NonNull String); + method @NonNull public static String[] list(@NonNull String); + method public static boolean put(@NonNull String, @NonNull byte[]); + method public static boolean remove(@NonNull String); + } + public final class WifiMigration { method @Nullable public static java.io.InputStream convertAndRetrieveSharedConfigStoreFile(int); method @Nullable public static java.io.InputStream convertAndRetrieveUserConfigStoreFile(int, @NonNull android.os.UserHandle); diff --git a/wifi/java/src/android/net/wifi/WifiKeystore.java b/wifi/java/src/android/net/wifi/WifiKeystore.java index ca86dde2fa45..1cda0326bf6c 100644 --- a/wifi/java/src/android/net/wifi/WifiKeystore.java +++ b/wifi/java/src/android/net/wifi/WifiKeystore.java @@ -16,6 +16,7 @@ package android.net.wifi; import android.annotation.NonNull; +import android.annotation.SuppressLint; import android.annotation.SystemApi; import android.os.Process; import android.os.ServiceManager; @@ -24,9 +25,11 @@ import android.security.legacykeystore.ILegacyKeystore; import android.util.Log; /** - * @hide This class allows wifi framework to store and access wifi certificate blobs. + * This class allows the storage and retrieval of non-standard Wifi certificate blobs. + * @hide */ -@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES) +@SystemApi +@SuppressLint("UnflaggedApi") // Promoting from @SystemApi(MODULE_LIBRARIES) public final class WifiKeystore { private static final String TAG = "WifiKeystore"; private static final String LEGACY_KEYSTORE_SERVICE_NAME = "android.security.legacykeystore"; @@ -48,7 +51,8 @@ public final class WifiKeystore { * @return true if the blob was successfully added. False otherwise. * @hide */ - @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES) + @SystemApi + @SuppressLint("UnflaggedApi") public static boolean put(@NonNull String alias, @NonNull byte[] blob) { try { Log.i(TAG, "put blob. alias " + alias); @@ -68,7 +72,8 @@ public final class WifiKeystore { * Returns null if no blob was found. * @hide */ - @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES) + @SystemApi + @SuppressLint("UnflaggedApi") public static @NonNull byte[] get(@NonNull String alias) { try { Log.i(TAG, "get blob. alias " + alias); @@ -89,7 +94,8 @@ public final class WifiKeystore { * @return True if a blob was removed. False if no such blob was found. * @hide */ - @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES) + @SystemApi + @SuppressLint("UnflaggedApi") public static boolean remove(@NonNull String alias) { try { getService().remove(alias, Process.WIFI_UID); @@ -110,7 +116,8 @@ public final class WifiKeystore { * The return value may be empty but never null. * @hide */ - @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES) + @SystemApi + @SuppressLint("UnflaggedApi") public static @NonNull String[] list(@NonNull String prefix) { try { final String[] aliases = getService().list(prefix, Process.WIFI_UID); @@ -123,4 +130,4 @@ public final class WifiKeystore { } return new String[0]; } -}
\ No newline at end of file +} |