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() {