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

Commit 9235b6e5 authored by Branden Archer's avatar Branden Archer
Browse files

Add shared prefix to key state enum in ContactKeysManager 

To follow the API guidelines, adding a shared
prefix to the key states.

Bug: 322979243
Bug: 290696572
Test: atest CtsContactKeysManagerTestCases:ContactKeysManagerTest
Change-Id: I89ebb29817709865ee94897c364bc0448383ca8a
parent fc6b8460

core/api/current.txt

+3 −3
Original line number Diff line number Diff line
@@ -35286,9 +35286,9 @@ package android.provider { 
    method @RequiresPermission(android.Manifest.permission.WRITE_CONTACTS) public void updateOrInsertContactKey(@NonNull String, @NonNull String, @NonNull String, @NonNull byte[]);

    method @RequiresPermission(android.Manifest.permission.WRITE_CONTACTS) public boolean updateOrInsertSelfKey(@NonNull String, @NonNull String, @NonNull byte[]);

    method @RequiresPermission(android.Manifest.permission.WRITE_CONTACTS) public boolean updateSelfKeyRemoteVerificationState(@NonNull String, @NonNull String, int);

    field public static final int UNVERIFIED = 0; // 0x0

    field public static final int VERIFICATION_FAILED = 1; // 0x1

    field public static final int VERIFIED = 2; // 0x2

    field public static final int VERIFICATION_STATE_UNVERIFIED = 0; // 0x0

    field public static final int VERIFICATION_STATE_VERIFICATION_FAILED = 1; // 0x1

    field public static final int VERIFICATION_STATE_VERIFIED = 2; // 0x2

  }















  public static final class ContactKeysManager.ContactKey implements android.os.Parcelable {

























core/java/android/provider/ContactKeysManager.java



+9
−9




























Original line number
Diff line number
Diff line








@@ -354,9 +354,9 @@ public final class ContactKeysManager {













































    private static void validateVerificationState(int verificationState) {













        if (verificationState != UNVERIFIED













                && verificationState != VERIFICATION_FAILED













                && verificationState != VERIFIED) {













        if (verificationState != VERIFICATION_STATE_UNVERIFIED













                && verificationState != VERIFICATION_STATE_VERIFICATION_FAILED













                && verificationState != VERIFICATION_STATE_VERIFIED) {















            throw new IllegalArgumentException("Verification state value "















                    + verificationState + " is not supported");















        }










@@ -600,9 +600,9 @@ public final class ContactKeysManager {













     * @hide















     */















    @IntDef(prefix = {"VERIFICATION_STATE_"}, value = {













            UNVERIFIED,













            VERIFICATION_FAILED,













            VERIFIED













            VERIFICATION_STATE_UNVERIFIED,













            VERIFICATION_STATE_VERIFICATION_FAILED,













            VERIFICATION_STATE_VERIFIED















    })















    @Retention(RetentionPolicy.SOURCE)















    public @interface VerificationState {}









@@ -610,15 +610,15 @@ public final class ContactKeysManager {













    /**















     * Unverified state of a contact E2EE key.















     */













    public static final int UNVERIFIED = 0;













    public static final int VERIFICATION_STATE_UNVERIFIED = 0;















    /**















     * Failed verification state of a contact E2EE key.















     */













    public static final int VERIFICATION_FAILED = 1;













    public static final int VERIFICATION_STATE_VERIFICATION_FAILED = 1;















    /**















     * Verified state of a contact E2EE key.















     */













    public static final int VERIFIED = 2;













    public static final int VERIFICATION_STATE_VERIFIED = 2;































    /** @hide */















    public static final class ContactKeys {