Merge "Ensure GeofenceHardware will return capabilities for old implementations."

1 files changed, 6 insertions, 1 deletions

diff --git a/core/java/android/hardware/location/GeofenceHardwareImpl.java b/core/java/android/hardware/location/GeofenceHardwareImpl.java
index b34c9fbb7948..ee2d43ce45f3 100644
--- a/core/java/android/hardware/location/GeofenceHardwareImpl.java
+++ b/core/java/android/hardware/location/GeofenceHardwareImpl.java
@@ -239,7 +239,12 @@ public final class GeofenceHardwareImpl {
                     case GeofenceHardware.MONITORING_TYPE_GPS_HARDWARE:
                         return CAPABILITY_GNSS;
                     case GeofenceHardware.MONITORING_TYPE_FUSED_HARDWARE:
-                        return mCapabilities;
+                        if (mVersion >= FIRST_VERSION_WITH_CAPABILITIES) {
+                            return mCapabilities;
+                        }
+                        // This was the implied capability on old FLP HAL versions that didn't
+                        // have the capability callback.
+                        return CAPABILITY_GNSS;
                 }
                 break;
         }