commit 4179fa2881b6114e4687e339fc5d43bfc0161bd6
author Xinyi Zhou <zxy@google.com> Wed Feb 09 14:55:29 2022 -0800
committer Xinyi Zhou <zxy@google.com> Thu Feb 10 04:05:45 2022 +0000
tree 54fe7886e09de2fb514573fed6eb0b0a4422197f
parent c5e7a86a5d4a0a5a09c2991189506c1f4c8a727d

Add toString helper method

Test: Built and flashed.
Change-Id: I5accdd11ffbde29f339beee7c03faa95fab74cc3

nearby/service/java/com/android/server/nearby/util/DataUtils.java

diff --git a/nearby/service/java/com/android/server/nearby/util/DataUtils.java b/nearby/service/java/com/android/server/nearby/util/DataUtils.java
index c67d2f3..ce738c8 100644
--- a/nearby/service/java/com/android/server/nearby/util/DataUtils.java
+++ b/nearby/service/java/com/android/server/nearby/util/DataUtils.java
@@ -16,6 +16,8 @@
 
 package com.android.server.nearby.util;
 
+import androidx.annotation.NonNull;
+
 import service.proto.Cache.ScanFastPairStoreItem;
 import service.proto.Cache.StoredDiscoveryItem;
 import service.proto.FastPairString.FastPairStrings;
@@ -34,9 +36,9 @@
      * Converts a {@link GetObservedDeviceResponse} to a {@link ScanFastPairStoreItem}.
      */
     public static ScanFastPairStoreItem toScanFastPairStoreItem(
-            GetObservedDeviceResponse observedDeviceResponse, String bleAddress) {
+            GetObservedDeviceResponse observedDeviceResponse, @NonNull String bleAddress) {
         Device device = observedDeviceResponse.getDevice();
-        ScanFastPairStoreItem item = ScanFastPairStoreItem.newBuilder()
+        return ScanFastPairStoreItem.newBuilder()
                 .setAddress(bleAddress)
                 .setActionUrl(device.getIntentUri())
                 .setDeviceName(device.getName())
@@ -45,7 +47,33 @@
                 .setAntiSpoofingPublicKey(device.getAntiSpoofingKeyPair().getPublicKey())
                 .setFastPairStrings(getFastPairStrings(observedDeviceResponse))
                 .build();
-        return item;
+    }
+
+    /**
+     * Prints readable string for a {@link FastPairStrings}
+     */
+    public static String toString(FastPairStrings fastPairStrings) {
+        return "FastPairStrings["
+                + "tapToPairWithAccount=" + fastPairStrings.getTapToPairWithAccount()
+                + ", tapToPairWithoutAccount=" + fastPairStrings.getTapToPairWithoutAccount()
+                + ", initialPairingDescription=" + fastPairStrings.getInitialPairingDescription()
+                + ", pairingFinishedCompanionAppInstalled="
+                + fastPairStrings.getPairingFinishedCompanionAppInstalled()
+                + ", pairingFinishedCompanionAppNotInstalled="
+                + fastPairStrings.getPairingFinishedCompanionAppNotInstalled()
+                + ", subsequentPairingDescription="
+                + fastPairStrings.getSubsequentPairingDescription()
+                + ", retroactivePairingDescription="
+                + fastPairStrings.getRetroactivePairingDescription()
+                + ", waitAppLaunchDescription=" + fastPairStrings.getWaitAppLaunchDescription()
+                + ", pairingFailDescription=" + fastPairStrings.getPairingFailDescription()
+                + ", assistantHalfSheetDescription="
+                + fastPairStrings.getAssistantHalfSheetDescription()
+                + ", assistantNotificationDescription="
+                + fastPairStrings.getAssistantNotificationDescription()
+                + ", fastPairTvConnectDeviceNoAccountDescription="
+                + fastPairStrings.getFastPairTvConnectDeviceNoAccountDescription()
+                + "]";
     }
 
     private static FastPairStrings getFastPairStrings(GetObservedDeviceResponse response) {