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

Commit 6d5544ef authored by Robert Berry's avatar Robert Berry Committed by android-build-merger
Browse files

Add warning comment about serialization am: 52c15f16 

am: f7a3d024

Change-Id: Ib3e2c86f7ef41e57d4a3667cdab78c9c26d716d0
parents 3a4b29a8 f7a3d024

core/java/android/security/keystore/recovery/KeyChainProtectionParams.java

+16 −0
Original line number Diff line number Diff line
@@ -50,6 +50,22 @@ import java.util.Arrays; 
 */

@SystemApi

public final class KeyChainProtectionParams implements Parcelable {



    // IMPORTANT! PLEASE READ!

    // -----------------------

    // If you edit this file (e.g., to add new fields), please MAKE SURE to also do the following:

    // - Update the #writeToParcel(Parcel) method below

    // - Update the #(Parcel) constructor below

    // - Update android.security.keystore.recovery.KeyChainSnapshotTest to make sure nobody

    //     accidentally breaks your fields in the Parcel in the future.

    // - Update com.android.server.locksettings.recoverablekeystore.serialization

    //     .KeyChainSnapshotSerializer to correctly serialize your new field

    // - Update com.android.server.locksettings.recoverablekeystore.serialization

    //     .KeyChainSnapshotSerializer to correctly deserialize your new field

    // - Update com.android.server.locksettings.recoverablekeystore.serialization

    //     .KeychainSnapshotSerializerTest to make sure nobody breaks serialization of your field

    //     in the future.



    /** @hide */

    @Retention(RetentionPolicy.SOURCE)

    @IntDef(prefix = {"TYPE_"}, value = {TYPE_LOCKSCREEN})

core/java/android/security/keystore/recovery/KeyChainSnapshot.java

+16 −0
Original line number Diff line number Diff line
@@ -48,6 +48,22 @@ import java.util.List; 
 */

@SystemApi

public final class KeyChainSnapshot implements Parcelable {



    // IMPORTANT! PLEASE READ!

    // -----------------------

    // If you edit this file (e.g., to add new fields), please MAKE SURE to also do the following:

    // - Update the #writeToParcel(Parcel) method below

    // - Update the #(Parcel) constructor below

    // - Update android.security.keystore.recovery.KeyChainSnapshotTest to make sure nobody

    //     accidentally breaks your fields in the Parcel in the future.

    // - Update com.android.server.locksettings.recoverablekeystore.serialization

    //     .KeyChainSnapshotSerializer to correctly serialize your new field

    // - Update com.android.server.locksettings.recoverablekeystore.serialization

    //     .KeyChainSnapshotSerializer to correctly deserialize your new field

    // - Update com.android.server.locksettings.recoverablekeystore.serialization

    //     .KeychainSnapshotSerializerTest to make sure nobody breaks serialization of your field

    //     in the future.



    private static final int DEFAULT_MAX_ATTEMPTS = 10;

    private static final long DEFAULT_COUNTER_ID = 1L;

core/java/android/security/keystore/recovery/KeyDerivationParams.java

+16 −0
Original line number Diff line number Diff line
@@ -35,6 +35,22 @@ import java.lang.annotation.RetentionPolicy; 
 */

@SystemApi

public final class KeyDerivationParams implements Parcelable {



    // IMPORTANT! PLEASE READ!

    // -----------------------

    // If you edit this file (e.g., to add new fields), please MAKE SURE to also do the following:

    // - Update the #writeToParcel(Parcel) method below

    // - Update the #(Parcel) constructor below

    // - Update android.security.keystore.recovery.KeyChainSnapshotTest to make sure nobody

    //     accidentally breaks your fields in the Parcel in the future.

    // - Update com.android.server.locksettings.recoverablekeystore.serialization

    //     .KeyChainSnapshotSerializer to correctly serialize your new field

    // - Update com.android.server.locksettings.recoverablekeystore.serialization

    //     .KeyChainSnapshotSerializer to correctly deserialize your new field

    // - Update com.android.server.locksettings.recoverablekeystore.serialization

    //     .KeychainSnapshotSerializerTest to make sure nobody breaks serialization of your field

    //     in the future.



    private final int mAlgorithm;

    private final byte[] mSalt;

    private final int mMemoryDifficulty;

core/java/android/security/keystore/recovery/WrappedApplicationKey.java

+15 −0
Original line number Diff line number Diff line
@@ -42,6 +42,21 @@ public final class WrappedApplicationKey implements Parcelable { 
    // The only supported format is AES-256 symmetric key.

    private byte[] mEncryptedKeyMaterial;



    // IMPORTANT! PLEASE READ!

    // -----------------------

    // If you edit this file (e.g., to add new fields), please MAKE SURE to also do the following:

    // - Update the #writeToParcel(Parcel) method below

    // - Update the #(Parcel) constructor below

    // - Update android.security.keystore.recovery.KeyChainSnapshotTest to make sure nobody

    //     accidentally breaks your fields in the Parcel in the future.

    // - Update com.android.server.locksettings.recoverablekeystore.serialization

    //     .KeyChainSnapshotSerializer to correctly serialize your new field

    // - Update com.android.server.locksettings.recoverablekeystore.serialization

    //     .KeyChainSnapshotSerializer to correctly deserialize your new field

    // - Update com.android.server.locksettings.recoverablekeystore.serialization

    //     .KeychainSnapshotSerializerTest to make sure nobody breaks serialization of your field

    //     in the future.



    /**

     * Builder for creating {@link WrappedApplicationKey}.

     */