From 95d26ae188f8524a5d94bd9f5a9ff600d145ab7f Mon Sep 17 00:00:00 2001
From: Yahav Nussbaum <yahav@google.com>
Date: Mon, 23 Sep 2024 09:35:02 +0000
Subject: [PATCH] Add persist.bluetooth.finder.supported property

Bug: 365462615
Test: Covered by existing tests

Change-Id: I4389295c8b43d70356582388f5a6bf82bb3e47b2
---
 nearby/framework/java/android/nearby/NearbyManager.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/nearby/framework/java/android/nearby/NearbyManager.java b/nearby/framework/java/android/nearby/NearbyManager.java
index 39adee376a..150394b1d0 100644
--- a/nearby/framework/java/android/nearby/NearbyManager.java
+++ b/nearby/framework/java/android/nearby/NearbyManager.java
@@ -123,9 +123,12 @@ public class NearbyManager {
 
     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 @@ public class NearbyManager {
     }
 
     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() {