Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 04d6a542 authored by Gabriel Biren's avatar Gabriel Biren Committed by Android (Google) Code Review
Browse files

Merge "Replace Keystore Migration flag with a new read-only flag." into main

parents 86ee9a10 9dec67b6

core/api/module-lib-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -321,7 +321,7 @@ package android.net.netstats { 
package android.net.wifi {



  public final class WifiMigration {

    method @FlaggedApi("android.net.wifi.flags.legacy_keystore_to_wifi_blobstore_migration") public static void migrateLegacyKeystoreToWifiBlobstore();

    method @FlaggedApi("android.net.wifi.flags.legacy_keystore_to_wifi_blobstore_migration_read_only") public static void migrateLegacyKeystoreToWifiBlobstore();

  }



}

wifi/java/src/android/net/wifi/WifiMigration.java

+1 −1
Original line number Diff line number Diff line
@@ -574,7 +574,7 @@ public final class WifiMigration { 
     *

     * @hide

     */

    @FlaggedApi(Flags.FLAG_LEGACY_KEYSTORE_TO_WIFI_BLOBSTORE_MIGRATION)

    @FlaggedApi(Flags.FLAG_LEGACY_KEYSTORE_TO_WIFI_BLOBSTORE_MIGRATION_READ_ONLY)

    @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)

    public static void migrateLegacyKeystoreToWifiBlobstore() {

        final long identity = Binder.clearCallingIdentity();

wifi/wifi.aconfig

+2 −1
Original line number Diff line number Diff line
@@ -19,11 +19,12 @@ flag { 
}



flag {

    name: "legacy_keystore_to_wifi_blobstore_migration"

    name: "legacy_keystore_to_wifi_blobstore_migration_read_only"

    is_exported: true

    namespace: "wifi"

    description: "Add API to migrate all values from Legacy Keystore to the new Wifi Blobstore database"

    bug: "332560152"

    is_fixed_read_only: true

}



flag {