commit 95d26ae188f8524a5d94bd9f5a9ff600d145ab7f
author Yahav Nussbaum <yahav@google.com> Mon Sep 23 09:35:02 2024 +0000
committer Yahav Nussbaum <yahav@google.com> Mon Sep 23 09:41:36 2024 +0000
tree 3633ee8c6702ed607497337774141a5baaf6e026
parent 9daf0afa3db7db5a683c81e321c0bc963611afc0

Add persist.bluetooth.finder.supported property

Bug: 365462615
Test: Covered by existing tests

Change-Id: I4389295c8b43d70356582388f5a6bf82bb3e47b2

nearby/framework/java/android/nearby/NearbyManager.java

diff --git a/nearby/framework/java/android/nearby/NearbyManager.java b/nearby/framework/java/android/nearby/NearbyManager.java
index 39adee3..150394b 100644
--- a/nearby/framework/java/android/nearby/NearbyManager.java
+++ b/nearby/framework/java/android/nearby/NearbyManager.java
@@ -123,9 +123,12 @@
 
     private static final int POWERED_OFF_FINDING_EID_LENGTH = 20;
 
-    private static final String POWER_OFF_FINDING_SUPPORTED_PROPERTY =
+    private static final String POWER_OFF_FINDING_SUPPORTED_PROPERTY_RO =
             "ro.bluetooth.finder.supported";
 
+    private static final String POWER_OFF_FINDING_SUPPORTED_PROPERTY_PERSIST =
+            "persist.bluetooth.finder.supported";
+
     /**
      * TODO(b/286137024): Remove this when CTS R5 is rolled out.
      * Whether allows Fast Pair to scan.
@@ -618,7 +621,9 @@
     }
 
     private boolean isPoweredOffFindingSupported() {
-        return Boolean.parseBoolean(SystemProperties.get(POWER_OFF_FINDING_SUPPORTED_PROPERTY));
+        return Boolean.parseBoolean(SystemProperties.get(POWER_OFF_FINDING_SUPPORTED_PROPERTY_RO))
+                || Boolean.parseBoolean(SystemProperties.get(
+                        POWER_OFF_FINDING_SUPPORTED_PROPERTY_PERSIST));
     }
 
     private boolean areLocationAndBluetoothEnabled() {