Ensure GeofenceHardware will return capabilities for old implementations.

New FLP HAL implementations will explicitly return their capabilities,
but old versions won't (the implicit capability in old versions was
GNNS).  Ensure that the getCapabilities feature of GeofenceHardware
will return GNNS for old binaries, so GmsCore doesn't have to worry
about versioning.

Change-Id: I4b1c942b0d68d87bfbb18b8c06fd9d8b8f68efa6

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 b34c9fb..ee2d43c 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;
         }