Use Intdef to replace Jave enum in PairingProgressListener.
Test: skip test for const.
Bug: 201673262
Change-Id: I26a8025900d99f9a8aaf6e1b28a80c557dd2209a
diff --git a/nearby/service/java/com/android/server/nearby/common/bluetooth/fastpair/PairingProgressListener.java b/nearby/service/java/com/android/server/nearby/common/bluetooth/fastpair/PairingProgressListener.java
index 8f8e498..270cb42 100644
--- a/nearby/service/java/com/android/server/nearby/common/bluetooth/fastpair/PairingProgressListener.java
+++ b/nearby/service/java/com/android/server/nearby/common/bluetooth/fastpair/PairingProgressListener.java
@@ -16,24 +16,46 @@
package com.android.server.nearby.common.bluetooth.fastpair;
+import androidx.annotation.IntDef;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
/** Callback interface for pairing progress. */
public interface PairingProgressListener {
- /** Enum for pairing events. */
- enum PairingEvent {
- START,
- SUCCESS,
- FAILED,
- UNKNOWN;
- public static PairingEvent fromOrdinal(int ordinal) {
- PairingEvent[] values = PairingEvent.values();
- if (ordinal < 0 || ordinal >= values.length) {
- return UNKNOWN;
- }
- return values[ordinal];
+ /** Fast Pair Bond State. */
+ @Retention(RetentionPolicy.SOURCE)
+ @IntDef(
+ value = {
+ PairingEvent.START,
+ PairingEvent.SUCCESS,
+ PairingEvent.FAILED,
+ PairingEvent.UNKNOWN,
+ })
+ public @interface PairingEvent {
+ int START = 0;
+ int SUCCESS = 1;
+ int FAILED = 2;
+ int UNKNOWN = 3;
+ }
+
+ /** Returns enum based on the ordinal index. */
+ static @PairingEvent int fromOrdinal(int ordinal) {
+ switch (ordinal) {
+ case 0:
+ return PairingEvent.START;
+ case 1:
+ return PairingEvent.SUCCESS;
+ case 2:
+ return PairingEvent.FAILED;
+ case 3:
+ return PairingEvent.UNKNOWN;
+ default:
+ return PairingEvent.UNKNOWN;
}
}
/** Callback function upon pairing progress update. */
- void onPairingProgressUpdating(PairingEvent event, String message);
+ void onPairingProgressUpdating(@PairingEvent int event, String message);
}