From 24e2cb207bdb39e3e1138f135a58659bca44d69f Mon Sep 17 00:00:00 2001 From: Wei Wang Date: Sat, 12 Mar 2022 12:15:34 -0800 Subject: [PATCH] API changes for resolving API council comments. Bug:222291473 Bug:222291491 Bug:222291420 Bug:222291565 Test: atest CtsNearbyFastPairTestCases Test: atest NearbyUnitTests Ignore-AOSP-First: new project CTS-Coverage-Bug: 217565373 Change-Id: I653c58216cb789df80699eef5c6e0c693f9296fc --- framework-t/api/system-current.txt | 32 ++++++++++++------------------ 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/framework-t/api/system-current.txt b/framework-t/api/system-current.txt index 4739d8d812..304e821655 100644 --- a/framework-t/api/system-current.txt +++ b/framework-t/api/system-current.txt @@ -21,16 +21,13 @@ package android.nearby { field public static final int STATUS_OK = 0; // 0x0 } - public abstract class BroadcastRequest implements android.os.Parcelable { - method public int describeContents(); + public abstract class BroadcastRequest { method @NonNull public java.util.List getMediums(); method @IntRange(from=0xffffff81, to=126) public int getTxPower(); method public int getType(); method public int getVersion(); - method public void writeToParcel(@NonNull android.os.Parcel, int); field public static final int BROADCAST_TYPE_NEARBY_PRESENCE = 3; // 0x3 field public static final int BROADCAST_TYPE_UNKNOWN = -1; // 0xffffffff - field @NonNull public static final android.os.Parcelable.Creator CREATOR; field public static final int PRESENCE_VERSION_UNKNOWN = -1; // 0xffffffff field public static final int PRESENCE_VERSION_V0 = 0; // 0x0 field public static final int PRESENCE_VERSION_V1 = 1; // 0x1 @@ -338,10 +335,12 @@ package android.nearby { } public final class PresenceBroadcastRequest extends android.nearby.BroadcastRequest implements android.os.Parcelable { + method public int describeContents(); method @NonNull public java.util.List getActions(); method @NonNull public android.nearby.PrivateCredential getCredential(); method @NonNull public java.util.List getExtendedProperties(); method @NonNull public byte[] getSalt(); + method public void writeToParcel(@NonNull android.os.Parcel, int); field @NonNull public static final android.os.Parcelable.Creator CREATOR; } @@ -354,15 +353,12 @@ package android.nearby { method @NonNull public android.nearby.PresenceBroadcastRequest.Builder setVersion(int); } - public abstract class PresenceCredential implements android.os.Parcelable { - method public int describeContents(); + public abstract class PresenceCredential { method @NonNull public byte[] getAuthenticityKey(); method @NonNull public java.util.List getCredentialElements(); method public int getIdentityType(); method @NonNull public byte[] getSecretId(); method public int getType(); - method public void writeToParcel(@NonNull android.os.Parcel, int); - field @NonNull public static final android.os.Parcelable.Creator CREATOR; field public static final int CREDENTIAL_TYPE_PRIVATE = 0; // 0x0 field public static final int CREDENTIAL_TYPE_PUBLIC = 1; // 0x1 field public static final int IDENTITY_TYPE_PRIVATE = 1; // 0x1 @@ -399,9 +395,11 @@ package android.nearby { } public final class PresenceScanFilter extends android.nearby.ScanFilter implements android.os.Parcelable { + method public int describeContents(); method @NonNull public java.util.List getCredentials(); method @NonNull public java.util.List getExtendedProperties(); method @NonNull public java.util.List getPresenceActions(); + method public void writeToParcel(@NonNull android.os.Parcel, int); field @NonNull public static final android.os.Parcelable.Creator CREATOR; } @@ -415,35 +413,34 @@ package android.nearby { } public final class PrivateCredential extends android.nearby.PresenceCredential implements android.os.Parcelable { + method public int describeContents(); method @NonNull public String getDeviceName(); method @NonNull public byte[] getMetadataEncryptionKey(); + method public void writeToParcel(@NonNull android.os.Parcel, int); field @NonNull public static final android.os.Parcelable.Creator CREATOR; } public static final class PrivateCredential.Builder { - ctor public PrivateCredential.Builder(@NonNull byte[], @NonNull byte[]); + ctor public PrivateCredential.Builder(@NonNull byte[], @NonNull byte[], @NonNull byte[], @NonNull String); method @NonNull public android.nearby.PrivateCredential.Builder addCredentialElement(@NonNull android.nearby.CredentialElement); method @NonNull public android.nearby.PrivateCredential build(); - method @NonNull public android.nearby.PrivateCredential.Builder setDeviceName(@NonNull String); method @NonNull public android.nearby.PrivateCredential.Builder setIdentityType(int); - method @NonNull public android.nearby.PrivateCredential.Builder setMetadataEncryptionKey(@NonNull byte[]); } public final class PublicCredential extends android.nearby.PresenceCredential implements android.os.Parcelable { + method public int describeContents(); method @NonNull public byte[] getEncryptedMetadata(); method @NonNull public byte[] getEncryptedMetadataKeyTag(); method @NonNull public byte[] getPublicKey(); + method public void writeToParcel(@NonNull android.os.Parcel, int); field @NonNull public static final android.os.Parcelable.Creator CREATOR; } public static final class PublicCredential.Builder { - ctor public PublicCredential.Builder(@NonNull byte[], @NonNull byte[]); + ctor public PublicCredential.Builder(@NonNull byte[], @NonNull byte[], @NonNull byte[], @NonNull byte[], @NonNull byte[]); method @NonNull public android.nearby.PublicCredential.Builder addCredentialElement(@NonNull android.nearby.CredentialElement); method @NonNull public android.nearby.PublicCredential build(); - method @NonNull public android.nearby.PublicCredential.Builder setEncryptedMetadata(@NonNull byte[]); - method @NonNull public android.nearby.PublicCredential.Builder setEncryptedMetadataKeyTag(@NonNull byte[]); method @NonNull public android.nearby.PublicCredential.Builder setIdentityType(int); - method @NonNull public android.nearby.PublicCredential.Builder setPublicKey(@NonNull byte[]); } public interface ScanCallback { @@ -452,12 +449,9 @@ package android.nearby { method public void onUpdated(@NonNull android.nearby.NearbyDevice); } - public abstract class ScanFilter implements android.os.Parcelable { - method public int describeContents(); + public abstract class ScanFilter { method @IntRange(from=0, to=127) public int getMaxPathLoss(); method public int getType(); - method public void writeToParcel(@NonNull android.os.Parcel, int); - field @NonNull public static final android.os.Parcelable.Creator CREATOR; } public final class ScanRequest implements android.os.Parcelable {