| commit | 6adbea7de64503ab988fd33d2befa43bea2cad40 | [log] [tgz] |
|---|---|---|
| author | Xinyi Zhou <zxy@google.com> | Tue Aug 09 09:58:50 2022 -0700 |
| committer | Xinyi Zhou <zxy@google.com> | Tue Aug 09 20:01:44 2022 +0000 |
| tree | f1e3ba7983a35ef735e44e41e657be3db82b0721 | |
| parent | 9c80fc5da7510384561b5151075c0c8e707aecdb [diff] |
Fix broken test Test: -m Ignore-AOSP-First: nearby_not_in_aosp_yet Change-Id: I95210a20bf09a136d6f030e8b0eee5dc756462af Fix: 241903268
diff --git a/nearby/service/java/com/android/server/nearby/presence/PresenceDiscoveryResult.java b/nearby/service/java/com/android/server/nearby/presence/PresenceDiscoveryResult.java index c99bce2..b403e33 100644 --- a/nearby/service/java/com/android/server/nearby/presence/PresenceDiscoveryResult.java +++ b/nearby/service/java/com/android/server/nearby/presence/PresenceDiscoveryResult.java
@@ -42,14 +42,16 @@ if (salt == null) { salt = new byte[0]; } - return new PresenceDiscoveryResult.Builder() - .setTxPower(device.getTxPower()) + PresenceDiscoveryResult.Builder builder = new PresenceDiscoveryResult.Builder(); + builder.setTxPower(device.getTxPower()) .setRssi(device.getRssi()) .setSalt(salt) .addPresenceAction(device.getAction()) - .setPublicCredential(device.getPublicCredential()) - .addExtendedProperties(device.getPresenceDevice().getExtendedProperties()) - .build(); + .setPublicCredential(device.getPublicCredential()); + if (device.getPresenceDevice() != null) { + builder.addExtendedProperties(device.getPresenceDevice().getExtendedProperties()); + } + return builder.build(); } private final int mTxPower;
diff --git a/nearby/tests/unit/src/com/android/server/nearby/presence/PresenceDiscoveryResultTest.java b/nearby/tests/unit/src/com/android/server/nearby/presence/PresenceDiscoveryResultTest.java index 0f61e43..e7fda2a 100644 --- a/nearby/tests/unit/src/com/android/server/nearby/presence/PresenceDiscoveryResultTest.java +++ b/nearby/tests/unit/src/com/android/server/nearby/presence/PresenceDiscoveryResultTest.java
@@ -82,7 +82,6 @@ PresenceDiscoveryResult.fromDevice(builder.build()); PresenceScanFilter scanFilter = new PresenceScanFilter.Builder() .setMaxPathLoss(80) - .addPresenceAction(PRESENCE_ACTION) .addCredential(mCredential) .build();